Removed TODOs from template and cleaned up the text. More to do after Ellen's CL that moves common messages. Pushing this to avoid merge conflicts, and have maze/template.soy better prepared for final changes.
Merge pull request #43 from brokenairplane/mooc

Removed TODOs from template and cleaned up the text.