Merge branch 'master' into rename-repo-url

ejs/ejs.d.ts

@@ -46,7 +46,7 @@ declare module "ejs" {
             scanLine(line: string): any;
 
         }
-        module Template {
+        namespace Template {
             interface MODES {
                 EVAL: string;
                 ESCAPED: string;
@@ -88,4 +88,4 @@ declare module "ejs" {
 
     }
     export = Ejs;
-}
+}