Arrange JSON instances more like the rest of our code.
Oops, I reverted too far.
Empty JSON is a decoder error.
Merge branch 'master' into topic/json-instances

Conflicts:
	build.sbt
Merge pull request #149 from http4s/topic/json-instances

Arrange JSON instances more like the rest of our code.