Bump up i18n gem
Stop using i18n's built in HTML error handling.

i18n doesn't depend on active support which means it can't use our html_safe
code to do its escaping when generating the spans.  Rather than try to sanitize
the output from i18n, just revert to our old behaviour of rescuing the error
and constructing the tag ourselves.

Fixes: CVE-2013-4491

Conflicts:
	actionpack/lib/action_view/helpers/translation_helper.rb

Backport: 50afd8eec9d088ad5a2d41f00a05520d5b78a6a0

Conflicts:
	actionpack/lib/action_view/helpers/translation_helper.rb
Merge pull request #4 from square/fix-i18n

Bump i18n and backport CVE-2013-4491