Updated keymap and base settings
Merge branch 'master' of github.com:patricknaish/sublime-config