Minor cleanup of code to enable access from the host
get updates from head and merge
Merge branch 'master' of github.com:sykesm/cf-vagrant-installer
Revert "Minor cleanup of code to enable access from the host"

This reverts commit edd0e9cea6b2809d5cfe9134a92c24d5f7a0290b.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:sykesm/cf-vagrant-installer
Bring master back in sync with upstream.
Call dir_server:install during boostrap
Cleanup branches and remotes
Merge branch 'sykesm-access-from-host' into sykesm-fix-runner-install
PR #52 merged