Avoid dict comprehension syntax for Python 2.6 compatibility.
Merge pull request #19 from agriffis/py26

Avoid dict comprehension syntax for Python 2.6 compatibility.