Scala 2.11.1

Scala 2.11.0 was botched, let's just skip it.

Conflicts:
	.travis.yml
	project/build.scala
Scala 2.11.0-RC3

Conflicts:
	.travis.yml
	project/build.scala