added FactoryGirl and DatabaseCleaner stuff