Change base docker images
Move etcd to _output
Merge pull request #144 from liggitt/etcd_output

Move etcd to _output