More changes for sbt 0.13, also refactoring build according to effective sbt rules
Release 0.6.0