Bump to Scala 2.11.4.
The master branch is 'master' again.