Made factory_girl work.
Changes on user.rb to pass the currently failing tests