Use python's OrderedDict instead of django's datastructure

This is part of python 2.7 so we can simply use it since we don't support 2.6
anymore
Merge