Updated sublime settings.
Resolve merge in sublime-settings.