Use etcd from master

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

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Add docker build to Makefile

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