updated org-mode
Merge branch 'master' of https://github.com/floatingman/.emacs.d
updated a few config files
Merge branch 'master' of github.com:floatingman/.emacs.d
resolved conflicts