Merge pull request #827 from ucb-bar/firrtlfixes