Adding user to content plans

Specifically define users on a content plan rather than the current
method of selecting all users under content in a plan.
Fix comment mailer spec based on changes to the users on a content plan