Change dict comprehension incompatibility

The dict comprehension does not work on python 2.6, which is what live
uses; use dict-zip instead
Improve the dict-zip so it's not as stupid
Merge pull request #542 from adamrp/fix_dict_comprehension

Change dict comprehension incompatibility