.bashrc set $EDITOR to vim
Git to use patience diff algorithm
Git to not create .orig files when fixing merge conflicts
Further squashing of vim-sneak