get 2.4 tests passing...
Merge branch 'dev' of github.com:dalehenrich/tode into dev