Backwards-compatibility for 'auto'. Fixes #821.
Merge pull request #934 from mojombo/auto-to-watch

Backwards-compatibility for 'auto'