ZookeeperMasterDetector initial setup
Remove commented code
Added missing dependency to tox.ini
Various cleanups and code improvements

- Parse the ZK url instead of doing string replacements
- Split out some of the lines to make it a little more readable
Merge branch 'master' into feature/zk-detector

Conflicts:
	pesos/detector.py
	pesos/scheduler.py
	setup.py
	tox.ini
Merge branch 'feature/zk-detector' into wip-branches