Scala 2.11

Few tweaks (well jenkins is failing for some reason ;)