Set up the monitor only on await for tasks

Closes #2345
qualify that PowerShell doesn't work yet
Merge pull request #2358 from chyndman/win-contributing-edit

qualify that PowerShell doesn't work yet