figaro controla el entorno junto a omniauth
Merge branch 'omni'

Conflicts:
	Gemfile