upgrade version of lift-json so the benchmarks compile
use the s2 macro to get better (one test per line) formatted output and not use manual fragment joining
Merge pull request #124 from jedws/benchmark-lift

upgrade version of lift-json so the benchmarks compile
Merge pull request #125 from jedws/test-output-format

tests: use the s2 macro to get better (one test per line) formatted output
Merge branch 'master' of github.com:argonaut-io/argonaut

Conflicts:
	src/test/scala/argonaut/JsonSpecification.scala