Better build.sbt + cleanup
Merge pull request #2 from stkem/master

Better build.sbt + cleanup