Modwork

Allows moderate_or_post to be set to 2 and allow users to moderate and post in the same discussion. Also fixed a bug that was causing already moderated comments to still show moderation dropdown and button. Had to fix that to keep users from moderating their own comments.

Further, commented out some of the lines in upgrades that I'd prefer to roll out later after we've seen what the current changes will do to improve moderation.