Merge file system categories with categories from YAML.

Fixes #2527
Add test for the concatenation of categories
Merge pull request #2531 from jekyll/merge-post-categories