Fixed lifted Poly macro and reinstated tests. Thanks to @xeno_by for assistance.
Fixed lifted Poly macro and reinstated tests. Thanks to @xeno_by for assistance.

Conflicts:
	core/src/main/scala/shapeless/poly.scala
Merge branch 'master' into scala-2.11.x

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