Added back in commented code.

* This was removed for debugging and made it into a commit
  accidently.
ordereddict.OrderedDict now searched for.

* If collections.OrderedDict doesn't exist, it will try to get it from
  ordereddict.OrderedDict, otherwise it will fall back on just using a
  dict.
* Since we don't really need the performance promises OrderedDict
  promises we should cut this dependency entirely in a later release.
Added code to help support python 2.6.