Some refactoring on user model and a support file for cucumber
Stuff