Add git-gutter, Tabular and a few general tweaks
Single file config is nicer
Merge