migrates to 2.11.0-RC1
Merge remote-tracking branch 'github/pr/80' into scala-2.11.x

Conflicts:
	core/src/main/scala/shapeless/generic.scala