add org2blog mode auto-insert template
Merge branch 'master' of github.com:choppsv1/emacs.d

Conflicts:
	custom.el