Split up vagrant/ubuntu bootstrap
Various improvements/fixes for threads