Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/greenlock.js

index.js

@@ -321,9 +321,7 @@ LE.create = function (le) {
       }
     };
   }
-  if (!le.tlsOptions.key || !le.tlsOptions.cert) {
-    le.tlsOptions = require('localhost.daplie.me-certificates').merge(le.tlsOptions);
-  }
+
   // We want to move to using tlsOptions instead of httpsOptions, but we also need to make
   // sure anything that uses this object will still work if looking for httpsOptions.
   le.httpsOptions = le.tlsOptions;

package.json

@@ -70,7 +70,6 @@
     "le-challenge-sni": "^2.0.0",
     "le-sni-auto": "^2.1.3",
     "le-store-certbot": "^2.0.3",
-    "localhost.daplie.me-certificates": "^1.3.0",
     "node.extend": "^1.1.5",
     "pkijs": "^1.3.27",
     "rsa-compat": "^1.2.1"