fix import of OrderedDict
py2.6 support for testing
more py2.6 fixes
Merge remote-tracking branch 'ttanner/fix/ordered2.6' into develop