Add new environment and countryside mainstream categories

First part of https://www.pivotaltracker.com/story/show/68000602. More PRs incoming for the rest of that ticket.