switch to json http exceptions
actually commit the code that takes advantage of the json errors
Merge remote-tracking branch 'elliotpeele/master' into authcode-workflow

Conflicts:
	pyramid_oauth2_provider/tests.py
	pyramid_oauth2_provider/views.py
Fixing merge conflicts.