Use the correct name for mainstream categories in org admin

Also show them on the admin org "show/pre-edit" page.
Merge pull request #574 from alphagov/fixes-for-mainstream-cats-on-orgs

Fixes for mainstream cats on organisations

https://www.pivotaltracker.com/story/show/40064585