Update to Scala 2.11.2
Merge pull request #195 from nremond/patch-2

Update to Scala 2.11.2