added org pelican and html formatting
Merge branch 'master' of http://github.com/cpaulik/emacsconfig

Conflicts:
	init.el