Remove script watch
Make grunt watch optional
Resolve merge conflicts