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

...v/pull-29

Conflicts:
	Gemfile