document dict-comp and genexpr
document set-comp
correct ..versionadded:: for defmain
my mistake, should have spotted before merging and pushing
Merge master onto pr/580