derp derp
Merge branch 'master' of https://github.com/PierrePaul/pelican-strongly-typed into PierrePaul-master

Conflicts:
	templates/base.html
	templates/index.html
jadifying
jadifying
readme.org
readme
headers
features jade
remove article from index
article
page and articles
display categories if DISPLAY_CATEGORIES_ON_MENU
cleaning
gitignore