improved Vagrant setup
Merge branch 'dev' of https://github.com/allyjweir/lackawanna into dev