Upgrade to elasticsearch 0.20.4 and zookeeper 3.3.6

Fixes #12