added diffmerge shortcut
Periodic Sublime Updates