Updated to scala 2.11

+ cross-compile to 2.11 and 2.10