Scala 2.11.1

Conflicts:
  README.md