Merge branch 'master' of https://github.com/oneilcin/ansible-zookeeper

Conflicts:
	handlers/main.yml
Merge branch 'master' of https://github.com/oneilcin/ansible-zookeeper

Conflicts:
	handlers/main.yml