Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:sykesm/cf-vagrant-installer
Bring master back in sync with upstream.