Bump to Scala 2.11.5

Author: retronym

Diff for: .travis.yml

@@ -12,7 +12,7 @@ script:
   - admin/build.sh
 scala:
   - 2.10.4
-  - 2.11.4
+  - 2.11.5
 jdk:
   - oraclejdk8
 notifications:

Diff for: build.sbt

@@ -2,11 +2,9 @@ import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
 
 scalaModuleSettings
 
-scalaVersion := "2.11.4"
+scalaVersion := "2.11.5"
 
-snapshotScalaBinaryVersion := "2.11.4"
-
-// TODO this project can be cross build against 2.11 and 2.10, express that here.
+snapshotScalaBinaryVersion := "2.11.5"
 
 organization := "org.scala-lang.modules"