user management cleanup
Merge pull request #53 from apatel/master

user management cleanup