Feature/locale underscore fixes

There are a few more places where globalize needs to use the underscore version of a locale.