Addressing PEP 8 warnings and general cleanup.
Addressing PEP 8 warnings and general cleanup.

insequent/calico-docker,Metaswitch/calico-docker,projectcalico/calico-containers,projectcalico/calico-docker,projectcalico/calico-containers,projectcalico/calico-containers,insequent/calico-docker,Metaswitch/calico-docker,projectcalico/calico-docker