Fix shared folder name/path
Updates for Mac install
Merge branch 'master' into pat

Conflicts:
	INSTALL.osx.sh
Merge branch 'pat' of github.com:webcoyote/linux-vm into pat

Conflicts:
	Vagrantfile