Deal with JSON parse errors #511
Version bump
Added missing test file
Merge branch 'master' into yesod1.2

Conflicts:
	yesod-json/yesod-json.cabal