Add Sublimerge settings, vim/vi aliases