Fixes #79 - Cleaned up UsersController
Merge pull request #80 from rohitpaulk/clean-users-controller

Fixes #79 - Cleaned up UsersController