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

Update to Scala 2.11.2
Use standard snapshot versioning

Changing to standard snapshot versioning (x.y-SNAPSHOT) instead
of (x.y.z-SNAPSHOT) means we don't need to update snapshot
branches every time we tag a release.
Ask Travis to use Scala 2.11.2
Merge pull request #197 from richdougherty/snapshot-version

Use standard snapshot versioning
Merge pull request #198 from richdougherty/travis-scala-version

Ask Travis to use Scala 2.11.2