Updating to Scala 2.11.1, bringing back Scalatra example