Add git aliases to bashrc; remove unused stuff
Fix spacing in gitconfig