Updates for impending shapeless and Scala releases.
Merge branch 'master' into scala-2.11.x

Conflicts:
	.travis.yml
	project/Build.scala