Use new git completion/prompt scripts.

Also add in a few new git aliases