#888 Fix for --watch+only() issue

We want to clear mocha.grep if the grep is set via .only(). If it is set via the --grep option we want it to persist.