Removed Sublimerge bc it doesn't work
Changed tab_size from 4 to 3