Correcting a few things that got lost in the last merge
Merge branch 'master' of https://github.com/codalab/codalab