Cleanup specific stuff
Add message for DNS fail
Merge branch 'master' of github.com:dmytro/aws_deploy

Conflicts:
	config/environment.yml