Merge branch 'master' into roster_refactor

Gruntfile.js

@@ -122,7 +122,7 @@ module.exports = function(grunt) {
                 done();
         };
         var rjsext = (process.platform === 'win32') ? '.cmd' : '';
-        var rjs = path.resolve('./node_modules/.bin/r.js' + rjsext);
+        var rjs = '"' + path.resolve('./node_modules/.bin/r.js' + rjsext) + '"';
         exec(rjs + ' -o src/build.js && ' +
              rjs + ' -o src/build.js optimize=none out=builds/converse.js && ' +
              rjs + ' -o src/build-no-jquery.js &&' +

converse.js

@@ -1501,6 +1501,7 @@
             },
 
             updateVCard: function () {
+                if (!this.use_vcards) { return; }
                 var jid = this.model.get('jid'),
                     contact = converse.roster.get(jid);
                 if ((contact) && (!contact.get('vcard_updated'))) {

non_amd.html

@@ -31,7 +31,7 @@
     <!-- until here -->
     <script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script>
     <script type="text/javascript" src="src/otr.js"></script>
-    <script type="text/javascript" src="components/strophe/strophe.min.js"></script>
+    <script type="text/javascript" src="components/strophejs/strophe.js"></script>
     <script type="text/javascript" src="src/strophe.roster.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>