Add support for SBT 0.13
Merge branch 'master' into theon-feature/sbt0.13

Conflicts:
	build.sbt