Updated i18n - now with full tests and simplified loading
Merge pull request #7 from manuel-freire/i18n

Updated i18n - now with full tests