Auto-enable watch on 'serve'.

Addresses @kneath's and @chibicode's comments in #2695.