yaml, org mode tweaks
Merge branch 'master' of github.com:badri/dot-emacs-dot-d

Conflicts:
	init.el