diff --git a/src/stores/ContentRepositoryStore.js b/src/stores/ContentRepositoryStore.js
index e10a8b9..4c9a7e0 100644
--- a/src/stores/ContentRepositoryStore.js
+++ b/src/stores/ContentRepositoryStore.js
@@ -52,14 +52,12 @@ class ContentRepositoryStore {
     r.contentContainer = contentContainer;
     r.presenterContainer = presenterContainer;
 
-    let prepareContent = () => ContentRepositoryUtil.launchContentPreparer(r);
-    let prepareControl = () => ContentRepositoryUtil.launchControlPreparer(r);
-
-    prepareContent();
-    prepareControl();
+    ContentRepositoryUtil.launchContentPreparer(r);
+    ContentRepositoryUtil.launchControlPreparer(r);
 
     let installWatcher = (root, fn, callback) => {
-      let ignored = ['_build/**', '_site/**', '.git/**', '.DS_Store', 'npm-debug.log', 'build'];
+      let ignored = ['_build/**', '_site/**', '.git/**', '.DS_Store', 'npm-debug.log', 'build',
+        '**/node_modules/**'];
       let gitignorePath = path.join(root, ".gitignore");
 
       fs.readFile(gitignorePath, {encoding: 'utf-8'}, (error, content) => {
@@ -83,7 +81,16 @@ class ContentRepositoryStore {
       });
     };
 
+    let prepareContent = (path) => {
+      console.log("Launching content preparer because of a change to: " + path);
+      ContentRepositoryUtil.launchContentPreparer(r)
+    };
     installWatcher(r.contentRepositoryPath, prepareContent, (w) => r.contentWatcher = w);
+
+    let prepareControl = (path) => {
+      console.log("Launching control preparer because of a change to: " + path);
+      ContentRepositoryUtil.launchControlPreparer(r);
+    };
     installWatcher(r.controlRepositoryLocation, prepareControl, (w) => r.controlWatcher = w);
   }
 
diff --git a/src/utils/ContentRepositoryUtil.js b/src/utils/ContentRepositoryUtil.js
index 126ab82..d815e3c 100644
--- a/src/utils/ContentRepositoryUtil.js
+++ b/src/utils/ContentRepositoryUtil.js
@@ -232,7 +232,7 @@ export default {
       ],
       HostConfig: {
         Binds: [
-          repo.controlRepositoryLocation + ':/var/control-repo:ro',
+          repo.controlRepositoryLocation + ':/var/control-repo',
           controlOverrideDir + ':/var/override:ro'
         ],
         Links: [ "content-" + repo.id + ":content" ],