Use vim for git diff tool
Remove old git pull/push aliases, add alias for cherry pick
Add clean white space function