Some refactoring and added ZooKeeper executor.
Merge branch 'master' of https://github.com/chinook25/heatcontrol.git