averting disaster yet again
Merge branch 'master' of https://github.com/kellymontgomery/kmdotnet

Conflicts:
	.gitignore
	README
	cache/ArticlesGenerator-Readers
	cache/PagesGenerator-Readers
	pelicanconf.py