oops forgot to bump Scala version in Travis config
Merge branch 'master' into sbt-0.13.1