general dev updates
Merge branch 'master' of https://github.com/Smithsonian/vagrant-galaxy