Merge pull request #852 from ucb-bar/firrtlfixes