Changes requried for initial test on AWS
Merge branch 'george-sensu' of github.com:CloudBindle/youxia into george-sensu

Conflicts:
	youxia-setup/roles/ansible/tasks/main.yml