Consolidate git/htop/vim/archive tools into basic-tools