updated vagrant / bootstrap to support vmware fusion
Merge branch 'vagrant-fusion' into production
Merge branch 'production' into staging
merged staging into dev