Added Org mode.
Merge branch 'master' of github.com:LuminousMonkey/emacs-dots

Conflicts:
	.emacs.d/init.el