add simple exceptions to the api
Merge remote-tracking branch 'heroku/master' into test

Conflicts:
	wjordpress/api.py
add make command for resetting heroku db because i'm lazy