Zookeeper: Yosemite Fixes

Better formatting all around.