Merge branch 'deploy' into feature/upvote_and_flag
Adds check to disable up voting if you've already up voted an item.

Moved ‘flagged’ template function from events.js to template.js.
Merge branch 'feature/upvote_and_flag' into deploy