Updated to scala 2.11 and added support for both 2.10 and 2.11 scala versions (by fixing deprecations).