Switch to scala 2.11
Added support for type lambdas