i18n updates
remove extraneous rake task
Resolve merge conflicts