minor changes
minor merges
fixed map issue with filtering
Merge pull request #35 from josephcoombes/feature/category_pages

Feature/category pages