diff for PR
saving spot
merges master
fixes missing names, some bad template content
rewords things
Merge pull request #595 from codalab/feature/notifications

Fixes to notifications