Get ZK stuff to sort of work.
Increase timeout to 2 seconds.
Some zk test stuff.
Merge branch 'master' of github.com:azymnis/scalafish