Properly require i18n-iso639matrix and clean i18n.rb bit