Merge branch 'master' of https://github.com/madvertise/zookeeper into dev/pull-29

Conflicts:
	Gemfile
Merge pull request #1 from johnsir/dev/pull-29

Merge branch 'master' of https://github.com/madvertise/zookeeper into de...