Merge pull request #2 from amandeepgill-wf/master

Make vagrant/docker setup work
Merge branch 'master' into minor-run-config-updates