org-stuff and popwin
Merge branch 'master' of https://github.com/banrahan/emacs.d

Conflicts:
	init.el