Add auto watcher - refactor grunt file