Update FactoryGirl
Moved current_user-based methods into ApplicationController due to errors that tests did not pick up