vim-gitgutter and some settings fixes