Merge branches 'features/add-swarm-to-embarkjs' and 'features/add-swarm-to-embarkjs' of https://github.com/embark-framework/embark into features/add-swarm-to-embarkjs

lib/core/engine.js

@@ -146,7 +146,9 @@ class Engine {
         self.currentAbi = abi;
         self.contractsJSON = contractsJSON;
         pipeline.build(abi, contractsJSON, null, function() {
+          if (self.watch) {
             self.watch.restart(); // Necessary because changing a file while it is writing can stop it from being watched
+          }
           self.events.emit('outputDone');
         });
       });