org mode config
Merge branch 'master' of github.com:dongxiong/.emacs.d

Conflicts:
	modules/nae-org.el