Keep track of prefix when referring to companion objects.
Merge branch 'master' into scala-2.10.x

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