Proper categories for FAQ entries, removed the tag hack. Merged in all outstanding pull requests as well.