changed error codes and messages
Merge branch 'master' of https://github.com/cdparra/lifecontext
Merge branch 'master' of https://github.com/cdparra/lifecontext