Fix some conjugations, make generator test better.
Merge branch 'master' of https://github.com/datalurkur/Bushido-Mongers