SmartyPants setup
Markdown and Python config
Merge branch 'master' of https://github.com/lmichelbacher/emacs

Conflicts:
	README.md
weblogger.el setup