Want Python less than Python3 for this.
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	setup.py
Merge pull request #40 from chrislea/devel

You only want ordereddict for Python less than Python3.