Local mods
finished merge into branch
Merge branch 'master'
Implemented publish/unpublish for competitions. Updated competition list to only show published competitions.

Will need to publish active competitions in production to ensure this doesn't change behavior.
Commented out "unpublish" and therefore, "delete" for competitions that have been published.
Increasing read timeout.
Merge branch 'umaster'
Merge pull request #279 from irjudson/irj

Merging modifications for edit/delete, so I can deploy to test.
Merge remote-tracking branch 'upstream/master'
Cleaned up publish/unpublish javascript; fixed delete dialog. Updated competition upload dialog.