new config for deploy
Merge branch 'new_features' of github.com:anykey007/aespm2 into new_features

Conflicts:
	config/deploy.rb