Merge pull request #40 from xtuple/master

Merge new changes into 4_6_x.
Updated Vagrantfile (dev version)  with sourceDir = "../../../dev" to match up with my xTuple development installation directory structure.
JR VagrantFile for Dev system
JR Vagrantfile
Merge branch '4_6_x' of https://github.com/jrosengarden/xtuple-vagrant into 4_6_x
Updated Vagrantfile for MacBookPro environment
Merge remote-tracking branch 'upstream/4_7_x' into 4_7_x

Conflicts:
	Vagrantfile
	xtuple-desktop/Vagrantfile