Added conditional_operator to scan()
Merge pull request #36 from chrislea/devel

Update setup.py so we only require ordereddict for Python2.
Syntax fix for broken Python 2.6
Want Python less than Python3 for this.
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	setup.py