Move to scala 2.10.4 and shapeless 2.0.0