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

Some necessary changes have been pulled by upstream, so revert to that repo.