Add conflict-detection and vim-fugitive
Add more content from my .vimrc