Use the old method of making our dictionary
Merge pull request #10 from holdenk/fix-py-2.6

Use the old method of making our dictionary
Merge branch 'master' into add-simple-groupby