Activator 1.1.x scala upgrade

Rolls this branch up to the sacred land of Scala 2.11.