Adding inital i18n language support
Merge in i18n stuff
Clean up i18n integration