Fixing redirects for categories, tags and author URLs
Merge branch 'redirects'

Conflicts:
	includes/vip.php