Auto-enable watch on 'serve'.

Addresses @kneath's and @chibicode's comments in #2695.
Merge pull request #2858 from jekyll/auto-enable-watch