Merge pull request #16 from adriaanm/master

Build cleanup
Switch to openjdk6
Switch to scala-module-plugin, sbt 0.13.1