Upgrade to Scala 2.11.2

http://www.scala-lang.org/news/2.11.2
Merge pull request #334 from charleso/topic/scala-2.11.2

Upgrade to Scala 2.11.2