Refactor config.
Merge branch 'master' of github.com:stacken/ansible

Conflicts:
	inventory
	shell-servers.yml