upgraded to scala 2.11
Please enter the commit message for your changes. Lines starting