Replace dict comprehension for python 2.6

Fixes #17