Updated to scala 2.11 and lift 3-M2