Raise the correct exception on parse errors in Json.read_file
More descriptive exception text
Add better documentation to renaming structures
Renaming: fix value of avoids set by mk_from_nmap

avoids should contain the range of nmap, not its domain.
Merge branch 'stable'

Include fixes made in "stable" in "master"
added contains functions
Merge branch 'master' into unified-mapping