i18n using master branch rather than 3.2
Merge branch 'v2.0.0' of github.com:katalyst/koi into v2.0.0