ENH: switching to a ordereddict (0.14)