Update sublime prefs
Don't mess with whitespace when rebasing/merging