Notifications for people and roles fixes

Re: https://www.pivotaltracker.com/story/show/59496412

This 'should' fix the bugs indicated in the ticket, but I can't get GovDelivery running locally, so the only way to test it as far as I can see is to shove it up on preview.