Make window-margin use (now-updated) canonical upstream repo
Merge pull request #1630 from rrthomas/master

Make window-margin use (now-updated) canonical upstream repo