Scala 2.11.0-M7 upgrade.
Merge pull request #33 from adriaanm/2.11

Scala 2.11.0-M7 upgrade.