Merge pull request #325 from lavalamp/etcdChanFix

Don't double-close the channel when etcd returns an error.
improvements to integration test organization
Improve logging.