Update vim indentLine
Add vim-trailing-whitespace submodule.
Use gvimdiff as merge.tool
Turn on rebase.autosquash.