Merge pull request projectcalico#174 from projectcalico/fix-host-config

Move per-host config out of global config

Merge pull request projectcalico#160 from tomdee/tiny-build-image-siz…

…e-tweaks

Clean up a little for the build images

Merge pull request projectcalico#143 from mikev/master

add python egg info to git URL for python-etcd

Merge pull request projectcalico#129 from tonicbupt/dev

allow underscores in hostname due to `docker link`

Merge pull request projectcalico#116 from tomdee/cla

Update to new CLA process.

Merge pull request projectcalico#101 from tomdee/remove_gateway

Remove the concept of next_hops/gateway from the libcalico code

Merge pull request projectcalico#99 from matthewdupre/etcd-endpoints

Read etcd location from ETCD_ENDPOINTS if available

Merge pull request projectcalico#90 from robbrockbank/update-docker-py

Use latest versin of docker py

Fix up build container

Merge pull request projectcalico#77 from caseydavenport/cd4-integer-p…

…orts

Ensure ports are integers when creating Rule