make DefaultOrderedDict more sane
Merge branch 'top_sls_ordering' of git://github.com/bemehow/salt into bemehow-top_sls_ordering

Conflicts:
	salt/utils/odict.py