Updated build for Scala 2.11