Merge branch 'master' into shadowed-vars, bringing it up to date

Conflicts:
	src/lang/desugar.rkt
Merge branch 'master' into shadowed-vars
missing shadow annotation
Merge branch 'shadowed-vars' into nwo
merge weirdness in .gitignore