modify some personal shortcuts which conflicts with org-mode before.
Merge branch 'master' of https://github.com/totrit/emacs-config