move secret keys to env
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/initializers/omniauth.rb