more etcd fixes, and it still doesn't work
Merge branch 'master' of https://github.com/damlaren/cs244b_final_project

Conflicts:
	clients/etcd/etcd-client.cpp