Bumped to Scala 2.11