Fix broken aliases; add defaults from git-bash

Yet to be tested against a fresh Vagrant install.