Some touch up to user.rb (everything but creating new account from fb/twitter works)