Added gitgutter and some other tweaks
Silly conflict