small refactor on user controller
Merge branch 'master' of https://github.com/chowza/volatility_app