Move to Java 7 and Scala 2.11