Add new aliases and turn off backup for mergetool to gitconfig
Rewrite vimrc
Replace git prompt and add additional directories to PATH