Updated to Scala 2.11.1 and updated some dependencies