Add contributing guide
Update 'go get' sequences; fix author line
Reword to clarify necessary tools, etc.
Simplify repo setups in Go workspace
Update README with reference to CONTRIBUTING.adoc
Merge pull request #48 from nhr/contributing_guide

Merged by openshift-bot
Update exposed APIs
Remove etcd from Dockerfile
Add Vagrantfile for hacking
Merge pull request #54 from pmorie/vagrant

Merged by openshift-bot
Integrate builds in openshift origin
Merge pull request #43 from csrwng/integrate_builds_into_origin

Merged by openshift-bot
Add simple Makefile

Almost identical to the upstream commit
https://github.com/GoogleCloudPlatform/kubernetes/commit/51fd21c9e7dddc2e402ac85c32b724cf21dec851
Merge pull request #57 from VojtechVitek/makefile

Merged by openshift-bot
Merge branch 'master' into templateConfig

Conflicts:
	pkg/cmd/master/master.go
Merge remote-tracking branch 'origin/master' into templateConfig