Updates from macbook
Merge branch 'mac'

Conflicts:
	main.el
	vmware.el