Merge branch 'master' into serve-instances

src/bin.rs

@@ -200,7 +200,9 @@ fn main() {
 
             println!("Server listening on port {}", port);
 
-            loop {}
+            loop {
+                thread::park();
+            }
         },
         ("pack", _) => {
             eprintln!("'rojo pack' is not yet implemented!");

src/vfs_watch.rs

@@ -92,6 +92,8 @@ impl VfsWatcher {
             }
         }
 
-        loop {}
+        loop {
+            thread::park();
+        }
     }
 }