Merge branch 'rename' into develop

config/default.yml

@@ -19,9 +19,9 @@ cluster:
     # determine the number of workers.
     count: 8
 
-# Gonzales server settings.
+# Proxy server settings.
 proxy:
-  # Gonzales listen port.
+  # Proxy listen port.
   port: 55055
 
   # SSL key path.

package.json

@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/eamsen/node-janus"
+    "url": "git://github.com/mozilla/node-janus"
   },
   "keywords": [
     "spdy",