Get Scala in a separate step
Merge branch 'master' of github.com:propensive/rapture-build