Use OrderedDict from future.

That's less code we need to maintain...
Should we also mark this import path as deprecated?