Update .gitignore
Use consistent etcd name
Merge pull request #50 from pmorie/gitignore

Update .gitignore
Merge pull request #49 from danmcp/master

Merged by openshift-bot
Integrate builds in openshift origin