Don't always watch the current working directory.

Closes #1047
Merge remote-tracking branch 'origin/master'