Starting to work on error handling.
Merge branch 'master' of github.com:blakeembrey/notification-api

* 'master' of github.com:blakeembrey/notification-api:
  Fixed events tests, user test
  Fixed user updates to only return id, email