Adding basic auth
Adding rvm path
Adding deploy config
Merge branch 'feature/add_deploy_config' into staging

Conflicts:
	config/deploy.rb