updating apt-installs
Merge branch 'master' into windows-friendly-vagrant-install
various changes to get things up and running