Merge remote-tracking branch 'nfarina/master'

# Conflicts:
#	lib/plugin.js

lib/plugin.js

@@ -166,10 +166,12 @@ Plugin.installed = function() {
 
       // reconstruct full path
       var pluginPath = path.join(requirePath, name);
-
+      try {
         // we only care about directories
         if (!fs.statSync(pluginPath).isDirectory()) continue;
-
+      } catch (e) {
+        continue;
+      }
       // does this module contain a package.json?
       var pjson;
       try {

lib/server.js

@@ -23,7 +23,9 @@ module.exports = {
   Server: Server
 }
 
-function Server(insecureAccess) {
+function Server(insecureAccess, opts) {
+  opts = opts || {};
+
   // Setup Accessory Cache Storage
   accessoryStorage.initSync({ dir: User.cachedAccessoryPath() });
 
@@ -46,7 +48,7 @@ function Server(insecureAccess) {
   }.bind(this));
 
   this._plugins = this._loadPlugins(); // plugins[name] = Plugin instance
-  this._config = this._loadConfig();  
+  this._config = opts.config || this._loadConfig();
   this._cachedPlatformAccessories = this._loadCachedPlatformAccessories();
   this._bridge = this._createBridge();
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge",
   "description": "HomeKit support for the impatient",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "scripts": {
     "dev": "DEBUG=* ./bin/homebridge -D -P example-plugins/ || true"
   },