changed to vimdiff for diff/merge tool
added gitgutter
changed vim colorscheme
Not quite sure what I'm committing
Added vim as default git editor