Merge remote-tracking branch 'upstream/master'

.gitmodules

 [submodule "libsass"]
 	path = src/libsass
-	url = git://github.com/hcatlin/libsass.git
+	url = git://github.com/sass/libsass.git
 [submodule "test/sass-spec"]
 	path = test/fixtures/spec
 	url = https://github.com/sass/sass-spec.git

bin/node-sass

@@ -156,6 +156,7 @@ function watch(options, emitter) {
   gaze.on('error', emitter.emit.bind(emitter, 'error'));
 
   gaze.on('changed', function(file) {
+    options = getOptions([file], options);
     emitter.emit('warn', '=> changed: ' + file);
     render(options, emitter);
   });

binding.gyp

@@ -83,14 +83,8 @@
           ]
         }],
         ['OS!="win"', {
-          'cflags+': [
-            '-std=c++11'
-          ],
-          'cflags_c+': [
-            '-std=c++11'
-          ],
           'cflags_cc+': [
-            '-std=c++11'
+            '-std=c++0x'
           ]
         }]
       ]

test/cli.js

@@ -163,6 +163,31 @@ describe('cli', function() {
         fs.appendFileSync(src, 'body {}');
       }, 500);
     });
+
+    it('should render all watched files', function(done) {
+      fs.writeFileSync(fixture('simple/foo.scss'), '');
+      fs.writeFileSync(fixture('simple/bar.scss'), '');
+
+      var src = fixture('simple/foo.scss');
+      var watched = fixture('simple/bar.scss');
+      var bin = spawn(cli, [
+        src, '--stdout', '--watch', watched,
+        '--output-style', 'compressed'
+      ]);
+
+      bin.stdout.setEncoding('utf8');
+      bin.stdout.on('data', function(data) {
+        assert(data.trim() === 'body{background:white}');
+        bin.kill();
+        fs.unlinkSync(src);
+        fs.unlinkSync(watched);
+        done();
+      });
+
+      setTimeout(function() {
+        fs.appendFileSync(watched, 'body{background:white}');
+      }, 500);
+    });
   });
 
   describe('node-sass in.scss --output out.css', function() {