apply new assembly.sbt format
Merge branch 'master' of github.com:esplo/scala-sbt.g8

Conflicts:
	src/main/g8/build.sbt