Fixed hashing of maps, name changes

map now derives from dict, and hashes are computed from map.map instead
of a json string.