Update .vimrc/.gitconfig

--- Change(s) ------------------------------------
- Add redraw! command to key-mapping ',/'
- mergetool change; gvimdiff -> vimdiff
--------------------------------------------------