Updated the build to support Scala 2.11
Version bump to 2.7.1-SNAPSHOT
Merge branch '2.11.0'