Add watch command and grunt() helper