Bootstrap script adjustments, tidy up vimrc