Mainline of development moves to Scala 2.11.0.
Revert "Mainline of development moves to Scala 2.11.0."

This reverts commit 659f2f1458c5e43a7306f5910f460f0c02404d2a.
Travis updates following branch switch.