improve error handling, testing for api endpoints
Merge branch 'master' of github.com:phoenix-scitent/okm

Conflicts:
	spec/requests/api_spec.rb