loading contrib-watch to grunt plus other misc. changes