Making 'python setup.py test' work.
Merge branch 'master' of https://github.com/lweasel/ord-utils
Making 'python setup.py test' work (2).