Cleaned up build.sbt and sbt launcher file.
Merged