Fix travis-ci config to only get vet when tip or later
Option to use ZOOKEEPER_PATH env var to find fatjar
Merge pull request #18 from dougm/zk-server-path

Option to use ZOOKEEPER_PATH env var to find fatjar
Make delete trigger child watchers
Stylistic cleanup (i.e. golint)
Not Zookkeeper
Merge pull request #26 from mattrobenolt/patch-1

Not Zookkeeper
add path for jar if installed via apt-get
Merge pull request #27 from hdonnay/deb_search

add path for jar if installed via apt-get
Return an error for pending request on failed connect

If the client fails to connect to all servers then
any pending requests that have not yet been sent
will return an error of ErrNoServer
Merge pull request #30 from samuel/error-on-connect-fail

Return an error for pending request on failed connect
Added ability to wait for correct shutdown by waiting for closed channel
Merge pull request #34 from hannesg/close_channel_on_shtudown

Added ability to wait for correct shutdown
Update zookeeper download URL and switch to 1.3.1 for travis
Remove building with tip from travis
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zk/conn.go
Merge pull request #8 from obeattie/merge-upstream

Merge upstream changes