Added VMWare Player machine to test this OS on VMWare
Fixed the mess after failed merge