Updated to Scala 2.11, and some cleanup