Made HTML strings not auto-escape, and converted numbers to strings for concatenation
Merge pull request #597 from edx/grady/i18n-round-two

Fixed our (my) i18n headaches