Adds in the Scalariform plugin to keep consistency
Auto-formatted
Merge branch 'feature/autoFormatter' into tmp
Reformatted
Merge branch 'tmp' into feature/autoFormatterRan
Merge pull request #321 from twitter/feature/autoFormatterRan

Feature/auto formatter ran