let rails handle errors
simplify methods
Merge branch 'master' into heroku