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

If mocha.grep is set via .only() we want to clear the grep on each rerun(). If the grep is set --grep we want it to persist.