clean up some properties files, new script to show VM portmapping
changed ip address in properties file to be localhost
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm

Conflicts:
	Vagrantfile
	puppet/hiera/vm.yaml
	puppet/modules/env/manifests/demo.pp
Merge branch 'master' into test-vm

Conflicts:
	puppet/hiera/vm.yaml
Merge branch 'master' into test-vm

Conflicts:
	puppet/modules/env/manifests/dev.pp
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge remote-tracking branch 'origin/master' into test-vm
Merge remote-tracking branch 'origin/master' into test-vm
Merge branch 'master' into test-vm
Merge branch 'master' into test-vm
Merge remote-tracking branch 'origin/master' into test-vm
Merge remote-tracking branch 'origin/master' into test-vm
Update tests to login with username including browsername
Merge remote-tracking branch 'origin/master' into test-vm