Updated to Scala 2.11
Merge pull request #13 from adamretter/master

Updated to Scala 2.11