Merge branch 'master' into rename-repo-url

nopt/nopt.d.ts

@@ -18,7 +18,7 @@ declare module "nopt" {
 		validate: (data: CommandData, k: string, val: string) => boolean
 	}
 
-	module nopt {
+	namespace nopt {
 		export function clean(data: CommandData, types: FlagTypeMap, typeDefs?: TypeDefs): string
 		export var typeDefs: TypeDefs
 	}
@@ -36,11 +36,11 @@ declare module "nopt" {
 	interface OptionsParsed {
 		[k: string]: any
 		argv: {
-			remain: string[] 
+			remain: string[]
 			cooked: string[]
 			original: string[]
 		}
 	}
 
 	export = nopt
-}
+}