Scala style changes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from gphat/master

Scala-stylify Moe