Merge pull request #11 from csaurav/master

Code Cleanup -  replace User.find_* with find_* methods