Merge branch 'content-generator' (#671)

Conflicts (diff vs content-generator is pretty simple):
	pelican/contents.py
	pelican/generators.py
	pelican/settings.py