merge config changes

not devise omniauth in fact