Don't diminish subword-mode except in latest Emacs

Closes #138
Change initialisation order for todochiku to better handle missing commands

Fixes #140
Merge branch 'master' into mine