devise stuff:
Merge pull request #2 from monroepe/user_branch

devise stuff: