Merge branch master

Author: SamyPesse

lib/configuration.js

@@ -139,7 +139,7 @@ Configuration.prototype.normalizeLanguage = function() {
 Configuration.DEFAULT = {
     // Options that can't be extend
     "configFile": "book",
-    "generator": "site",
+    "generator": "website",
     "extension": null,
 
     // Book metadats (somes are extracted from the README by default)

package.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "q": "1.0.1",
         "lunr": "0.5.7",
-        "lodash": "3.2.0",
+        "lodash": "3.5.0",
         "graceful-fs": "3.0.5",
         "resolve": "0.6.3",
         "fs-extra": "0.16.5",