Rollback for Scala 2.10

Reverts all deprecations which break 2.10 compatability.
`-deprecation` is also reverted in `build.sbt`, as it will be
noisy when building on 2.11.

Let me know if anything else is needed.