Added 404 error handler
error handler returns 404 error as JSON response
Merge remote-tracking branch 'origin/master'

Conflicts:
	krakatoa/views.py