Added vim-surround and vim-repeat, changed git merge style to diff3