Bump Lift 3 to build only on Scala 2.11.1.
Drop lift-json-scalaz.

We’re only building on 2.11, so we’re only building
lift-json-scalaz7.
Fix 2.11 warning in CombParserHelpersSpec.
Merge remote-tracking branch 'origin/master' into so-you-can-dexy-while-you-dexy

Conflicts:
	project/Build.scala