make explicit variable names to allow modification
Merge branch 'fix.drop-port-forward' of git://github.com/mmerickel/docker-osx into mmerickel-fix.drop-port-forward

Conflicts:
	docker
Add port config also