Make needed changes to the build to facilitate having 2.11 cross-compilation

Don't know if using 2.11 is interesting for this project.
Checked that it works with `$ sbt ";+clean;+package;+test"` on mac os 10.9.3, will also be able to check this on a linux machine over the weekend.