Merge pull request #11 from adriaanm/master

Build cleanup
Update .travis.yml
Switch to scala-module-plugin, sbt 0.13.1