#36 more bug fixes with permalinks
#36 more updates
#36 updates and fixes
#36 more fixes
#36 additional unit test for categories when getting keyword
Merge branch '36-allow-category' into 45-remove-post-data-article-tag

Conflicts:
	tests/test_vpt.php
	virtualpages-with-templates.php