Merge branch 'master' into f8_categories
Categorty plugin
index page layout removed - now as blog.html
Category archive view
Category generator updated
Category page showing in proper template
Category archive template update
Merge branch 'f8_categories' into develop

This fixes #8. Category archives are in proper folders
Merge branch 'develop'