updated org-mode config and added additional key-bindings
Merge branch 'master' of https://github.com/floatingman/.emacs.d