Merge branch 'master' into master

bin/http-server

@@ -7,9 +7,14 @@ var colors     = require('colors/safe'),
     httpServer = require('../lib/http-server'),
     portfinder = require('portfinder'),
     opener     = require('opener'),
+
     fs         = require('fs'),
-    argv       = require('minimist')(process.argv.slice(2)),
     url        = require('url');
+var argv = require('minimist')(process.argv.slice(2), {
+  alias: {
+    tls: 'ssl'
+  }
+});
 var ifaces = os.networkInterfaces();
 
 process.title = 'http-server';
@@ -167,7 +172,7 @@ function listen(port) {
     }
   }
 
-  if (ssl) {
+  if (tls) {
     options.https = {
       cert: argv.C || argv.cert || 'cert.pem',
       key: argv.K || argv.key || 'key.pem'