Added word_forms docs/doctests, some refactoring
Merge remote-tracking branch 'origin/master'