Hard-code etcd ports to default values in bootstrap

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Update Makefile

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Refactor discoverd connection

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Use local client when host is also the leader

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Bump Godeps

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>