Pelican plugins
Merge branch 'master' of https://github.com/vrih/pelican-plugins

Conflicts:
	liquid_tags/vimeo.py
	liquid_tags/youtube.py