updated with latest keymapings
Merge branch 'master' of https://github.com/rballen/sublime-text-2