Update applicaion.yml
Remove old application.yml, install figaro
Add factory_girl_rails
Feature tests include stubbed-out omniauth
fix merge conflicts
fix merge?
merge