Cleaned up the grunt watcher so it caught failures