Vanity commit
Fix code so it uses a dict generator expression for compatibility with python 2.6