Replaced all instances of OrderedDict with a regular dict

As the ordering is determined by the c++ map, there is no need
to use an OrderedDict in python.