Remove sublimerge, Add git upstream alias
Add git stash drop alias
Colon and semicolon both enter command mode in Vim
Add vim packages and keybindings