Add mergetool settings
Sort VIM colour settings
Latex stuff