Merge branch 'master' of https://github.com/twitter/twitter-cldr-rb into global_locale_setter
Merge branch 'global_locale_setter' of https://github.com/twitter/twitter-cldr-rb into global_locale_setter