Remove dependency on ordereddict if sys.version_info > (2,7)