Added config for vmware fusion
Merge branch 'master' into composite