Mix watch server start in gulp

don't remove `npm start`, it still works and is needed elsewhere.