more zcluster support
zcluster support cleanup
Merge pull request #65 from andrew-enigma/master

more zcluster support