formatted with Scalariform
Merge pull request #3 from emchristiansen/autoformat

I just ran Scalariform on the whole project