Merge pull request #6 from modethirteen/master

reformat api exceptions
mock response content type
Merge remote-tracking branch 'upstream/master'