sign up fires a properly structured ajax call
fixed merge conflicts to reflect current_user and login state
deleted gem from gemfile and fixed merge conflicts in users_controller