Merge remote-tracking branch 'origin/master'
seems to work but still needs testing
an example
respond to code review comments & add port offset convenience var
document configuration mods
formatting tweak
formatting tweak 2
Merge remote-tracking branch 'XTUPLE/4_7_x'
Merge remote-tracking branch 'GIL/easeConfiguration' into easeConfiguration
removed privieged option from provisioner
Merge pull request #1 from lynnaloo/easeConfiguration

Provisioner privilege flag
Merge pull request #44 from gilmoskowitz/easeConfiguration

Ease configuration
ll
Merge remote-tracking branch 'upstream/4_7_x' into 4_7_x

Conflicts:
	Vagrantfile
	xtuple-desktop/Vagrantfile
JR