added Org mode, customized Scratch buffer
Merge branch 'master' of https://github.com/ccann/emacs