Start of including IP address as part of PortMap
Merge branch 'gear-links-150' of github.com:clusterhq/flocker into gear-links-150

Conflicts:
	flocker/node/functional/test_gear.py
	flocker/node/gear.py