diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000..4188205
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules/**
+templates/*/**
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..54cab19
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,29 @@
+{
+    "bitwise": true,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "noarg": true,
+    "noempty": true,
+    "nonew": true,
+    "undef": true,
+    "unused": "vars",
+    "trailing": true,
+    "indent": 4,
+    "boss": true,
+    "eqnull": true,
+    "node": true,
+    "maxcomplexity": 10,
+    "globals": {
+        "jasmine": true,
+        "beforeEach": false,
+        "afterEach": false,
+        "describe": false,
+        "xdescribe": false,
+        "it": false,
+        "xit": false,
+        "expect": false,
+        "spyOn": false
+    }
+}
diff --git a/cli.js b/cli.js
index e36ac5e..447462d 100644
--- a/cli.js
+++ b/cli.js
@@ -29,9 +29,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var fs = require("fs");
-var path = require("path");
-
 var Command = require("commander").Command;
 
 var config = require("./package.json");
diff --git a/lib/create.js b/lib/create.js
index ef1f270..5901e34 100644
--- a/lib/create.js
+++ b/lib/create.js
@@ -33,7 +33,9 @@ var fs = require("fs");
 var path = require("path");
 var MinitError = require("./error").MinitError;
 
-var create = exports = module.exports = function(templateName, config, templateModule) {
+exports = module.exports = create;
+exports.create = create;
+function create(templateName, config, templateModule) {
 
     config.templateName = templateName;
 
@@ -64,8 +66,7 @@ var create = exports = module.exports = function(templateName, config, templateM
         return config;
     });
 
-};
-exports.create = create;
+}
 
 exports.addCommandsTo = function(program) {
     var templatesDir = path.join(program.minitHome, "templates");
@@ -81,7 +82,7 @@ exports.addCommandsTo = function(program) {
                     .fail(function(error) {
                         var message = error.message;
                         if (error instanceof MinitError) {
-                            console.error(error.message);
+                            console.error(message);
                         } else {
                             throw error;
                         }
diff --git a/lib/mustache.js b/lib/mustache.js
deleted file mode 100644
index 9b5a4fa..0000000
--- a/lib/mustache.js
+++ /dev/null
@@ -1,536 +0,0 @@
-/*!
- * mustache.js - Logic-less {{mustache}} templates with JavaScript
- * http://github.com/janl/mustache.js
- */
-var Mustache = (typeof module !== "undefined" && module.exports) || {};
-
-(function (exports) {
-
-  exports.name = "mustache.js";
-  exports.version = "0.5.0-dev";
-  exports.tags = ["{{", "}}"];
-  exports.parse = parse;
-  exports.compile = compile;
-  exports.render = render;
-  exports.clearCache = clearCache;
-
-  // This is here for backwards compatibility with 0.4.x.
-  exports.to_html = function (template, view, partials, send) {
-    var result = render(template, view, partials);
-
-    if (typeof send === "function") {
-      send(result);
-    } else {
-      return result;
-    }
-  };
-
-  var _toString = Object.prototype.toString;
-  var _isArray = Array.isArray;
-  var _forEach = Array.prototype.forEach;
-  var _trim = String.prototype.trim;
-
-  var isArray;
-  if (_isArray) {
-    isArray = _isArray;
-  } else {
-    isArray = function (obj) {
-      return _toString.call(obj) === "[object Array]";
-    };
-  }
-
-  var forEach;
-  if (_forEach) {
-    forEach = function (obj, callback, scope) {
-      return _forEach.call(obj, callback, scope);
-    };
-  } else {
-    forEach = function (obj, callback, scope) {
-      for (var i = 0, len = obj.length; i < len; ++i) {
-        callback.call(scope, obj[i], i, obj);
-      }
-    };
-  }
-
-  var spaceRe = /^\s*$/;
-
-  function isWhitespace(string) {
-    return spaceRe.test(string);
-  }
-
-  var trim;
-  if (_trim) {
-    trim = function (string) {
-      return string == null ? "" : _trim.call(string);
-    };
-  } else {
-    var trimLeft, trimRight;
-
-    if (isWhitespace("\xA0")) {
-      trimLeft = /^\s+/;
-      trimRight = /\s+$/;
-    } else {
-      // IE doesn't match non-breaking spaces with \s, thanks jQuery.
-      trimLeft = /^[\s\xA0]+/;
-      trimRight = /[\s\xA0]+$/;
-    }
-
-    trim = function (string) {
-      return string == null ? "" :
-        String(string).replace(trimLeft, "").replace(trimRight, "");
-    };
-  }
-
-  var escapeMap = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': '&quot;',
-    "'": '&#39;'
-  };
-
-  function escapeHTML(string) {
-    return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
-      return escapeMap[s] || s;
-    });
-  }
-
-  /**
-   * Adds the `template`, `line`, and `file` properties to the given error
-   * object and alters the message to provide more useful debugging information.
-   */
-  function debug(e, template, line, file) {
-    file = file || "<template>";
-
-    var lines = template.split("\n"),
-        start = Math.max(line - 3, 0),
-        end = Math.min(lines.length, line + 3),
-        context = lines.slice(start, end);
-
-    var c;
-    for (var i = 0, len = context.length; i < len; ++i) {
-      c = i + start + 1;
-      context[i] = (c === line ? " >> " : "    ") + context[i];
-    }
-
-    e.template = template;
-    e.line = line;
-    e.file = file;
-    e.message = [file + ":" + line, context.join("\n"), "", e.message].join("\n");
-
-    return e;
-  }
-
-  /**
-   * Looks up the value of the given `name` in the given context `stack`.
-   */
-  function lookup(name, stack, defaultValue) {
-    if (name === ".") {
-      return stack[stack.length - 1];
-    }
-
-    var names = name.split(".");
-    var lastIndex = names.length - 1;
-    var target = names[lastIndex];
-
-    var value, context, i = stack.length, j, localStack;
-    while (i) {
-      localStack = stack.slice(0);
-      context = stack[--i];
-
-      j = 0;
-      while (j < lastIndex) {
-        context = context[names[j++]];
-
-        if (context == null) {
-          break;
-        }
-
-        localStack.push(context);
-      }
-
-      if (context && typeof context === "object" && target in context) {
-        value = context[target];
-        break;
-      }
-    }
-
-    // If the value is a function, call it in the current context.
-    if (typeof value === "function") {
-      value = value.call(localStack[localStack.length - 1]);
-    }
-
-    if (value == null)  {
-      return defaultValue;
-    }
-
-    return value;
-  }
-
-  function renderSection(name, stack, callback, inverted) {
-    var buffer = "";
-    var value =  lookup(name, stack);
-
-    if (inverted) {
-      // From the spec: inverted sections may render text once based on the
-      // inverse value of the key. That is, they will be rendered if the key
-      // doesn't exist, is false, or is an empty list.
-      if (value == null || value === false || (isArray(value) && value.length === 0)) {
-        buffer += callback();
-      }
-    } else if (isArray(value)) {
-      forEach(value, function (value) {
-        stack.push(value);
-        buffer += callback();
-        stack.pop();
-      });
-    } else if (typeof value === "object") {
-      stack.push(value);
-      buffer += callback();
-      stack.pop();
-    } else if (typeof value === "function") {
-      var scope = stack[stack.length - 1];
-      var scopedRender = function (template) {
-        return render(template, scope);
-      };
-      buffer += value.call(scope, callback(), scopedRender) || "";
-    } else if (value) {
-      buffer += callback();
-    }
-
-    return buffer;
-  }
-
-  /**
-   * Parses the given `template` and returns the source of a function that,
-   * with the proper arguments, will render the template. Recognized options
-   * include the following:
-   *
-   *   - file     The name of the file the template comes from (displayed in
-   *              error messages)
-   *   - tags     An array of open and close tags the `template` uses. Defaults
-   *              to the value of Mustache.tags
-   *   - debug    Set `true` to log the body of the generated function to the
-   *              console
-   *   - space    Set `true` to preserve whitespace from lines that otherwise
-   *              contain only a {{tag}}. Defaults to `false`
-   */
-  function parse(template, options) {
-    options = options || {};
-
-    var tags = options.tags || exports.tags,
-        openTag = tags[0],
-        closeTag = tags[tags.length - 1];
-
-    var code = [
-      'var buffer = "";', // output buffer
-      "\nvar line = 1;", // keep track of source line number
-      "\ntry {",
-      '\nbuffer += "'
-    ];
-
-    var spaces = [],      // indices of whitespace in code on the current line
-        hasTag = false,   // is there a {{tag}} on the current line?
-        nonSpace = false; // is there a non-space char on the current line?
-
-    // Strips all space characters from the code array for the current line
-    // if there was a {{tag}} on it and otherwise only spaces.
-    var stripSpace = function () {
-      if (hasTag && !nonSpace && !options.space) {
-        while (spaces.length) {
-          code.splice(spaces.pop(), 1);
-        }
-      } else {
-        spaces = [];
-      }
-
-      hasTag = false;
-      nonSpace = false;
-    };
-
-    var sectionStack = [], updateLine, nextOpenTag, nextCloseTag;
-
-    var setTags = function (source) {
-      tags = trim(source).split(/\s+/);
-      nextOpenTag = tags[0];
-      nextCloseTag = tags[tags.length - 1];
-    };
-
-    var includePartial = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nvar partial = partials["' + trim(source) + '"];',
-        '\nif (partial) {',
-        '\n  buffer += render(partial,stack[stack.length - 1],partials);',
-        '\n}',
-        '\nbuffer += "'
-      );
-    };
-
-    var openSection = function (source, inverted) {
-      var name = trim(source);
-
-      if (name === "") {
-        throw debug(new Error("Section name may not be empty"), template, line, options.file);
-      }
-
-      sectionStack.push({name: name, inverted: inverted});
-
-      code.push(
-        '";',
-        updateLine,
-        '\nvar name = "' + name + '";',
-        '\nvar callback = (function () {',
-        '\n  return function () {',
-        '\n    var buffer = "";',
-        '\nbuffer += "'
-      );
-    };
-
-    var openInvertedSection = function (source) {
-      openSection(source, true);
-    };
-
-    var closeSection = function (source) {
-      var name = trim(source);
-      var openName = sectionStack.length != 0 && sectionStack[sectionStack.length - 1].name;
-
-      if (!openName || name != openName) {
-        throw debug(new Error('Section named "' + name + '" was never opened'), template, line, options.file);
-      }
-
-      var section = sectionStack.pop();
-
-      code.push(
-        '";',
-        '\n    return buffer;',
-        '\n  };',
-        '\n})();'
-      );
-
-      if (section.inverted) {
-        code.push("\nbuffer += renderSection(name,stack,callback,true);");
-      } else {
-        code.push("\nbuffer += renderSection(name,stack,callback);");
-      }
-
-      code.push('\nbuffer += "');
-    };
-
-    var sendPlain = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nbuffer += lookup("' + trim(source) + '",stack,"");',
-        '\nbuffer += "'
-      );
-    };
-
-    var sendEscaped = function (source) {
-      code.push(
-        '";',
-        updateLine,
-        '\nbuffer += escapeHTML(lookup("' + trim(source) + '",stack,""));',
-        '\nbuffer += "'
-      );
-    };
-
-    var line = 1, c, callback;
-    for (var i = 0, len = template.length; i < len; ++i) {
-      if (template.slice(i, i + openTag.length) === openTag) {
-        i += openTag.length;
-        c = template.substr(i, 1);
-        updateLine = '\nline = ' + line + ';';
-        nextOpenTag = openTag;
-        nextCloseTag = closeTag;
-        hasTag = true;
-
-        switch (c) {
-        case "!": // comment
-          i++;
-          callback = null;
-          break;
-        case "=": // change open/close tags, e.g. {{=<% %>=}}
-          i++;
-          closeTag = "=" + closeTag;
-          callback = setTags;
-          break;
-        case ">": // include partial
-          i++;
-          callback = includePartial;
-          break;
-        case "#": // start section
-          i++;
-          callback = openSection;
-          break;
-        case "^": // start inverted section
-          i++;
-          callback = openInvertedSection;
-          break;
-        case "/": // end section
-          i++;
-          callback = closeSection;
-          break;
-        case "{": // plain variable
-          closeTag = "}" + closeTag;
-          // fall through
-        case "&": // plain variable
-          i++;
-          nonSpace = true;
-          callback = sendPlain;
-          break;
-        default: // escaped variable
-          nonSpace = true;
-          callback = sendEscaped;
-        }
-
-        var end = template.indexOf(closeTag, i);
-
-        if (end === -1) {
-          throw debug(new Error('Tag "' + openTag + '" was not closed properly'), template, line, options.file);
-        }
-
-        var source = template.substring(i, end);
-
-        if (callback) {
-          callback(source);
-        }
-
-        // Maintain line count for \n in source.
-        var n = 0;
-        while (~(n = source.indexOf("\n", n))) {
-          line++;
-          n++;
-        }
-
-        i = end + closeTag.length - 1;
-        openTag = nextOpenTag;
-        closeTag = nextCloseTag;
-      } else {
-        c = template.substr(i, 1);
-
-        switch (c) {
-        case '"':
-        case "\\":
-          nonSpace = true;
-          code.push("\\" + c);
-          break;
-        case "\r":
-          // Ignore carriage returns.
-          break;
-        case "\n":
-          spaces.push(code.length);
-          code.push("\\n");
-          stripSpace(); // Check for whitespace on the current line.
-          line++;
-          break;
-        default:
-          if (isWhitespace(c)) {
-            spaces.push(code.length);
-          } else {
-            nonSpace = true;
-          }
-
-          code.push(c);
-        }
-      }
-    }
-
-    if (sectionStack.length != 0) {
-      throw debug(new Error('Section "' + sectionStack[sectionStack.length - 1].name + '" was not closed properly'), template, line, options.file);
-    }
-
-    // Clean up any whitespace from a closing {{tag}} that was at the end
-    // of the template without a trailing \n.
-    stripSpace();
-
-    code.push(
-      '";',
-      "\nreturn buffer;",
-      "\n} catch (e) { throw {error: e, line: line}; }"
-    );
-
-    // Ignore `buffer += "";` statements.
-    var body = code.join("").replace(/buffer \+= "";\n/g, "");
-
-    if (options.debug) {
-      if (typeof console != "undefined" && console.log) {
-        console.log(body);
-      } else if (typeof print === "function") {
-        print(body);
-      }
-    }
-
-    return body;
-  }
-
-  /**
-   * Used by `compile` to generate a reusable function for the given `template`.
-   */
-  function _compile(template, options) {
-    var args = "view,partials,stack,lookup,escapeHTML,renderSection,render";
-    var body = parse(template, options);
-    var fn = new Function(args, body);
-
-    // This anonymous function wraps the generated function so we can do
-    // argument coercion, setup some variables, and handle any errors
-    // encountered while executing it.
-    return function (view, partials) {
-      partials = partials || {};
-
-      var stack = [view]; // context stack
-
-      try {
-        return fn(view, partials, stack, lookup, escapeHTML, renderSection, render);
-      } catch (e) {
-        throw debug(e.error, template, e.line, options.file);
-      }
-    };
-  }
-
-  // Cache of pre-compiled templates.
-  var _cache = {};
-
-  /**
-   * Clear the cache of compiled templates.
-   */
-  function clearCache() {
-    _cache = {};
-  }
-
-  /**
-   * Compiles the given `template` into a reusable function using the given
-   * `options`. In addition to the options accepted by Mustache.parse,
-   * recognized options include the following:
-   *
-   *   - cache    Set `false` to bypass any pre-compiled version of the given
-   *              template. Otherwise, a given `template` string will be cached
-   *              the first time it is parsed
-   */
-  function compile(template, options) {
-    options = options || {};
-
-    // Use a pre-compiled version from the cache if we have one.
-    if (options.cache !== false) {
-      if (!_cache[template]) {
-        _cache[template] = _compile(template, options);
-      }
-
-      return _cache[template];
-    }
-
-    return _compile(template, options);
-  }
-
-  /**
-   * High-level function that renders the given `template` using the given
-   * `view` and `partials`. If you need to use any of the template options (see
-   * `compile` above), you must compile in a separate step, and then call that
-   * compiled function.
-   */
-  function render(template, view, partials) {
-    return compile(template)(view, partials);
-  }
-
-})(Mustache);
\ No newline at end of file
diff --git a/lib/npm-wrapper.js b/lib/npm-wrapper.js
new file mode 100644
index 0000000..95b1217
--- /dev/null
+++ b/lib/npm-wrapper.js
@@ -0,0 +1,52 @@
+var Q = require("q");
+var npm = require("npm");
+
+// Because npm is a singleton there can actually only be one npm class active
+// at one moment. It's checked and set to true in the NpmWrapper constructor
+// and set to false in NpmWrapper#close.
+var isInUse = false;
+
+module.exports = NpmWrapper;
+function NpmWrapper(config) {
+    if (isInUse) {
+        throw new Error("Someone else is using npm. Call #close() to release it.");
+    }
+    isInUse = true;
+    this.closed = false;
+
+    config = config || {};
+
+    var self = this;
+    this.loaded = Q.ninvoke(npm, "load", config)
+    .then(function () {
+        // npm is a singleton within a process; loading with a
+        // new config does not appear to update the configuration
+        // in particular, the prefix from the original configuration
+        // is always used npm.config.set and other approaches
+        // do not end up with a change to the necessary npm.dir
+        // or npm.globalDir.
+        // Changing npm.prefix directly here does work, though
+        // if the configuration differed in other ways those might
+        // need to be manually set directly on npm as well
+        if (config.prefix) {
+            npm.prefix = config.prefix;
+        }
+
+        return self;
+    });
+
+}
+
+NpmWrapper.prototype.install = function() {
+    return this.loaded.then(function (self) {
+        if (self.closed) {
+            return self.closed;
+        }
+        return Q.ninvoke(npm.commands, "install");
+    });
+};
+
+NpmWrapper.prototype.close = function() {
+    isInUse = false;
+    this.closed = Q.reject(new Error("This npm wrapper is closed"));
+};
diff --git a/lib/template-base.js b/lib/template-base.js
index 9db423a..aed3d8a 100644
--- a/lib/template-base.js
+++ b/lib/template-base.js
@@ -30,12 +30,18 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Path = require("path");
-var Mustache = require("./mustache");
 var FS = require("fs");
 var Q = require("q");
 var qfs = require("q-io/fs");
 var os = require("os");
 
+var Mustache = require("mustache");
+// We're interpolating inside Javascript and CSS, and so do not want the
+// default HTML escaping
+Mustache.escape = function (string) {
+    return string;
+};
+
 var MinitError = require("./error").MinitError;
 
 var FILENAME_VARIABLE_START = "__";
@@ -65,7 +71,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
 
     validatePackageHome: {
         value: function (value) {
-            return new String(value)
+            return String(value);
         }
     },
 
@@ -74,7 +80,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
             var packageHome = process.cwd(),
                 root = qfs.root();
             if (root === "") {
-                root = "/"
+                root = "/";
             }
             while (true) {
                 if (FS.existsSync(Path.join(packageHome, "package.json"))) {
@@ -86,7 +92,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
                     break;
                 }
             }
-            return packageHome
+            return packageHome;
         }
     },
 
@@ -119,13 +125,13 @@ exports.TemplateBase = Object.create(Object.prototype, {
                 if (exists) {
                     promise = qfs.removeTree(mainBuildDir)
                         .then(function() {
-                            return qfs.makeDirectory(mainBuildDir)
+                            return qfs.makeDirectory(mainBuildDir);
                         });
                 } else {
                     promise = qfs.makeDirectory(mainBuildDir);
                 }
                 return promise.then(function() {
-                    return qfs.copyTree(self.directory, self.buildDir)
+                    return qfs.copyTree(self.directory, self.buildDir);
                 })
                 .then(function() {
                     return self.processBuildDirectory(self.buildDir);
@@ -136,7 +142,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
 
     finalDestination: {
         get: function() {
-            return Path.join(this.options.packageHome || "", this.options.destination || "")
+            return Path.join(this.options.packageHome || "", this.options.destination || "");
         }
     },
 
@@ -160,16 +166,16 @@ exports.TemplateBase = Object.create(Object.prototype, {
                                 }
                             });
                     }));
-                })
+                });
             });
-         }
+        }
     },
 
     _finish: {
         value: function() {
             var self = this;
             return this.finish(this.finalDestination).then(function() {
-                return qfs.removeDirectory(self.buildDir)
+                return qfs.removeDirectory(self.buildDir);
             });
         }
     },
@@ -216,7 +222,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
                 var newContents = self.applyTransform(data, self.options);
 
                 return qfs.write(filename, newContents).then(function () {
-                    return self.rename(filename)
+                    return self.rename(filename);
                 }).fail(function () {
                     console.log("Error writing to " + filename + ".");
                     throw "Error writing to " + filename + ".";
@@ -234,6 +240,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
     rename: {
         value: function(filename) {
             var newName = filename;
+            //jshint -W089
             for (var name in this.options) {
                 newName = newName.replace(
                     FILENAME_VARIABLE_START + name + FILENAME_VARIABLE_END,
@@ -249,6 +256,7 @@ exports.TemplateBase = Object.create(Object.prototype, {
                 }).done();
                 return done.promise;
             }
+            //jshint +W089
         }
     }
 
diff --git a/package.json b/package.json
index 64f0b08..ca307e2 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,14 @@
     "npm": "~1.3.7",
     "minidom": "~0.0.2",
     "diacritics": "latest",
-    "joey": "~1.1.0"
+    "joey": "~1.1.0",
+    "mustache": "~0.7.2"
   },
   "devDependencies": {
     "jasmine-node": "~1.7.0",
     "sandboxed-module": "~0.2.0",
-    "mocks": "~0.0.11"
+    "mocks": "~0.0.11",
+    "jshint": "~2.3.0"
   },
   "engines": {
     "node": "~0.10.2"
@@ -38,7 +40,7 @@
     "minit": "minit"
   },
   "scripts": {
-    "test": "node run-test.js"
+    "test": "jshint . && node run-test.js"
   },
   "preferGlobal": true
 }
diff --git a/run-test.js b/run-test.js
index 657a425..1fffc60 100644
--- a/run-test.js
+++ b/run-test.js
@@ -1,7 +1,6 @@
 "use strict";
 
 var jasmine = require('jasmine-node');
-var sys = require('sys');
 var path = require('path');
 var Q = require("q");
 
@@ -18,13 +17,21 @@ var junitreport = {
     useDotNotation: false
 };
 
-process.argv.forEach(function(arg){
-    switch(arg) {
-          case '--color': showColors = true; break;
-          case '--noColor': showColors = false; break;
-          case '--verbose': isVerbose = true; break;
-          case '--junit': junitreport.report = true; break;
-      }
+process.argv.forEach(function(arg) {
+    switch (arg) {
+    case '--color':
+        showColors = true;
+        break;
+    case '--noColor':
+        showColors = false;
+        break;
+    case '--verbose':
+        isVerbose = true;
+        break;
+    case '--junit':
+        junitreport.report = true;
+        break;
+    }
 });
 
 /**
@@ -57,12 +64,11 @@ jasmine.Block.prototype.execute = function (onComplete) {
 jasmine.executeSpecsInFolder({
     "specFolders": [__dirname+ "/test"],
     "onComplete": function(runner, log){
-      if (runner.results().failedCount == 0) {
-        process.exit(0);
-      }
-      else {
-        process.exit(1);
-      }
+        if (runner.results().failedCount === 0) {
+            process.exit(0);
+        } else {
+            process.exit(1);
+        }
     },
     "isVerbose": isVerbose,
     "showColors": showColors,
diff --git a/templates/app.js b/templates/app.js
index 1f609ab..c471c2a 100644
--- a/templates/app.js
+++ b/templates/app.js
@@ -1,9 +1,6 @@
 var PackageTemplate = require("./package").Template;
 var ArgumentError = require("../lib/error.js").ArgumentError;
-var path = require('path');
 var fs = require('fs');
-var npm = require("npm");
-var Q = require('q');
 var removeDiacritics = require("diacritics").remove;
 
 var _fromCamelToDashes = function(name) {
diff --git a/templates/component.js b/templates/component.js
index e543878..ec03081 100644
--- a/templates/component.js
+++ b/templates/component.js
@@ -30,9 +30,6 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var ModuleTemplate = require("./module").Template;
-var fs = require('fs');
-
-var Command = require("commander").Command;
 
 exports.Template = Object.create(ModuleTemplate, {
 
diff --git a/templates/digit.js b/templates/digit.js
index c0396ff..e040674 100644
--- a/templates/digit.js
+++ b/templates/digit.js
@@ -1,9 +1,6 @@
 var PackageTemplate = require("./package").Template;
 var ArgumentError = require("../lib/error.js").ArgumentError;
-var path = require('path');
 var fs = require('fs');
-var npm = require("npm");
-var Q = require('q');
 var removeDiacritics = require("diacritics").remove;
 
 
diff --git a/templates/messages.js b/templates/messages.js
index 2ef79b4..0745df1 100644
--- a/templates/messages.js
+++ b/templates/messages.js
@@ -37,7 +37,9 @@ exports.Template = Object.create(TemplateBase, {
             // find all html files
             console.log("Finding .html files...");
             return FS.listTree(".", function (path, stat) {
-                if (Path.basename(path) === "node_modules") return null;
+                if (Path.basename(path) === "node_modules") {
+                    return null;
+                }
                 return stat.isFile() && Path.extname(path) === ".html";
             })
             .then(function (tree) {
@@ -59,7 +61,7 @@ exports.Template = Object.create(TemplateBase, {
                         visit(body, function (element) {
                             // TODO collect more than just the first text node
                             var child = element.childNodes[0];
-                            if(element.hasChildNodes() && child.nodeType == 3 && child.nodeValue.trim()) {
+                            if(element.hasChildNodes() && child.nodeType === 3 && child.nodeValue.trim()) {
                                 results.push(child.nodeValue.trim());
                             }
                         });
@@ -76,7 +78,9 @@ exports.Template = Object.create(TemplateBase, {
                 // convert text to key, add to messages
                 var messages = {};
                 textNodes.forEach(function (data) {
-                    if (!data) return;
+                    if (!data) {
+                        return;
+                    }
                     console.log(data.messages.length + " messages found in " + data.path);
                     data.messages.forEach(function (message) {
                         var key = self._convertMessageToKey(message);
diff --git a/templates/module.js b/templates/module.js
index 4ccaba3..769a7c2 100644
--- a/templates/module.js
+++ b/templates/module.js
@@ -3,8 +3,6 @@ var ArgumentError = require("../lib/error.js").ArgumentError;
 var fs = require('fs');
 var removeDiacritics = require("diacritics").remove;
 
-var Command = require("commander").Command;
-
 var _fromCamelToDashes = function(name) {
     var s1 = name.replace(/([A-Z])/g, function (g) { return "-"+g.toLowerCase(); });
     s1 = s1.replace(/--/g, "-").replace(/^-/, "");
@@ -66,7 +64,7 @@ exports.Template = Object.create(TemplateBase, {
 
     validateName: {
         value: function(name) {
-           var exportedName = this.validateExport(name);
+            var exportedName = this.validateExport(name);
             // convert back from camelcase to dashes and ensure names are ascii
             return removeDiacritics(_fromCamelToDashes(exportedName));
         }
diff --git a/templates/package.js b/templates/package.js
index 8718777..9ce58b3 100644
--- a/templates/package.js
+++ b/templates/package.js
@@ -1,8 +1,9 @@
-var TemplateBase = require("../lib/template-base.js").TemplateBase;
+var TemplateBase = require("../lib/template-base").TemplateBase;
 var path = require('path');
 var fs = require('fs');
-var npm = require("npm");
+var NpmWrapper = require("../lib/npm-wrapper");
 var Q = require('q');
+var http = require("http");
 
 exports.Template = Object.create(TemplateBase, {
 
@@ -42,6 +43,9 @@ exports.Template = Object.create(TemplateBase, {
                     production : true,
                     loglevel: "warn"
                 };
+                if (self.options.npmCache) {
+                    config.cache = self.options.npmCache;
+                }
                 return self.installDependencies(config);
             }).then(function() {
                 console.log("#");
@@ -53,33 +57,66 @@ exports.Template = Object.create(TemplateBase, {
         }
     },
 
-    installDependencies: {
-        value: function (config) {
-            return Q.ninvoke(npm, "load", (config || null))
-                .then(function () {
+    /**
+     * Performs a HEAD request on `registry.npmjs.org` to check if the user
+     * and registry are online and available.
+     * @function
+     * @returns {Promise.<boolean>} `true` if the npm registry can be reached,
+     * `false` otherwise
+     */
+    _isOnline: {
+        value: function () {
+            var isOnline = Q.defer();
 
-                    // npm is a singleton within a process; loading with a
-                    // new config does not appear to update the configuration
-                    // in particular, the prefix from the original configuration
-                    // is always used npm.config.set and other approaches
-                    // do not end up with a change to the necessary npm.dir
-                    // or npm.globalDir.
-                    // Changing npm.prefix directly here does work, though
-                    // if the configuration differed in other ways those might
-                    // need to be manually set directly on npm as well
+            var req = http.request({
+                hostname: "registry.npmjs.org",
+                method: "HEAD"
+            }, function (res) {
+                // Listen to the data event so that the response stream can
+                // start, but we actually don't care about the response
+                res.on("data", function () {});
 
-                    if (config.prefix) {
-                        npm.prefix = config.prefix;
-                    }
+                if (res.statusCode === 200) {
+                    isOnline.resolve(true);
+                } else {
+                    isOnline.resolve(false);
+                }
+            });
+            req.on("error", function (error) {
+                isOnline.resolve(false);
+            });
+            req.end();
 
-                    return Q.ninvoke(npm.commands, "install");
+            return isOnline.promise;
+        }
+    },
+
+    installDependencies: {
+        value: function (config) {
+            return this._isOnline()
+            .then(function (isOnline) {
+                var npm;
+                if (isOnline) {
+                    npm = new NpmWrapper(config);
+                } else {
+                    // If we're not online then set the registry to null which
+                    // prevents any contact with the outside world
+                    config = Object.create(config);
+                    config.registry = null;
+                    npm = new NpmWrapper(config);
+                }
+
+                return npm.install()
+                .finally(function () {
+                    return npm.close();
                 });
+            });
         }
     },
 
     defaultPackageHome: {
         value: function (value) {
-            return process.cwd()
+            return process.cwd();
         }
     }
 
diff --git a/templates/spec.js b/templates/spec.js
index c95771a..fb0ef11 100644
--- a/templates/spec.js
+++ b/templates/spec.js
@@ -24,7 +24,7 @@ exports.Template = Object.create(TemplateBase, {
     didSetOptions: {
         value:function (options) {
             if (!options.title && options.name) {
-                options.title = options.name.replace(/(?:^|-)([^-])/g, function(match, g1) { return g1.toUpperCase() });
+                options.title = options.name.replace(/(?:^|-)([^-])/g, function(match, g1) { return g1.toUpperCase(); });
             }
         }
     },
@@ -35,7 +35,7 @@ exports.Template = Object.create(TemplateBase, {
 
     finalDestination: {
         get: function() {
-            return Path.join(this.options.packageHome, "test", this.options.destination)
+            return Path.join(this.options.packageHome, "test", this.options.destination);
         }
     },
 
diff --git a/templates/test.js b/templates/test.js
index 0851e9f..1b31c20 100644
--- a/templates/test.js
+++ b/templates/test.js
@@ -55,10 +55,10 @@ exports.Template = Object.create(TemplateBase, {
     didSetOptions: {
         value:function (options) {
             if (!options.title && options.name) {
-                options.title = options.name.replace(/(?:^|-)([^-])/g, function(match, g1) { return g1.toUpperCase() });
+                options.title = options.name.replace(/(?:^|-)([^-])/g, function(match, g1) { return g1.toUpperCase(); });
             }
             if (options.name) {
-                options.propertyName = options.name.replace(/(?:-)([^-])/g, function(match, g1) { return g1.toUpperCase() });
+                options.propertyName = options.name.replace(/(?:-)([^-])/g, function(match, g1) { return g1.toUpperCase(); });
             }
         }
     },
@@ -69,7 +69,7 @@ exports.Template = Object.create(TemplateBase, {
 
     finalDestination: {
         get: function() {
-            return Path.join(this.options.packageHome, "test", this.options.destination)
+            return Path.join(this.options.packageHome, "test", this.options.destination);
         }
     },
 
diff --git a/test/cli-spec.js b/test/cli-spec.js
index 093318e..dfcb443 100644
--- a/test/cli-spec.js
+++ b/test/cli-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 
 describe("minit", function () {
@@ -17,7 +15,7 @@ describe("minit", function () {
         mainSandbox = {
             requires: {'./lib/create': mockCreate}
         };
-   });
+    });
 
     it("should add creation commands", function () {
         var addCommandsToSpy = spyOn(mockCreate, "addCommandsTo");
diff --git a/test/lib/create-spec.js b/test/lib/create-spec.js
index 6af825c..8326b7f 100644
--- a/test/lib/create-spec.js
+++ b/test/lib/create-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 var Q = require("q");
diff --git a/test/lib/npm-wrapper-spec.js b/test/lib/npm-wrapper-spec.js
new file mode 100644
index 0000000..c1dee09
--- /dev/null
+++ b/test/lib/npm-wrapper-spec.js
@@ -0,0 +1,78 @@
+var SandboxedModule = require('sandboxed-module');
+
+function nextTickCallback() {
+    process.nextTick(arguments[arguments.length - 1]);
+}
+
+describe("NpmWrapper", function () {
+    var NpmWrapper, npmMock;
+    beforeEach(function () {
+        npmMock = {
+            load: nextTickCallback,
+            commands: {
+                install: nextTickCallback
+            }
+        };
+        NpmWrapper = SandboxedModule.require('../../lib/npm-wrapper', {
+            requires: {
+                "npm": npmMock
+            }
+        });
+    });
+
+    it("loads", function () {
+        npmMock.load = jasmine.createSpy().andCallFake(nextTickCallback);
+        var config = {};
+        var npm = new NpmWrapper(config);
+        return npm.loaded.then(function (value) {
+            expect(npmMock.load).toHaveBeenCalled();
+            expect(npmMock.load.mostRecentCall.args[0]).toBe(config);
+            expect(value).toBe(npm);
+        });
+    });
+
+    it("loads without a config", function () {
+        npmMock.load = jasmine.createSpy().andCallFake(nextTickCallback);
+        var npm = new NpmWrapper();
+        return npm.loaded.then(function (value) {
+            expect(npmMock.load).toHaveBeenCalled();
+            expect(value).toBe(npm);
+        });
+    });
+
+    it("calls install", function () {
+        npmMock.commands.install = jasmine.createSpy().andCallFake(nextTickCallback);
+        var npm = new NpmWrapper();
+        return npm.install().then(function () {
+            expect(npmMock.commands.install).toHaveBeenCalled();
+        });
+    });
+
+    it("does not allow two open instances", function () {
+        var a = new NpmWrapper();
+        var b;
+        expect(function () {
+            b = new NpmWrapper();
+        }).toThrow();
+        expect(a).toBeDefined();
+        expect(b).not.toBeDefined();
+    });
+
+    it("allows a second instance after closing the first", function () {
+        var a = new NpmWrapper();
+        a.close();
+        var b = new NpmWrapper();
+        expect(b).toBeDefined();
+    });
+
+    it("returns a rejected promise after being closed", function () {
+        var a = new NpmWrapper();
+        a.close();
+        return a.install().then(function () {
+            expect(true).toBe(false);
+        }, function (error) {
+            expect(error.message).toEqual("This npm wrapper is closed");
+        });
+    });
+
+});
diff --git a/test/lib/template-base-spec.js b/test/lib/template-base-spec.js
index c6497d5..3077609 100644
--- a/test/lib/template-base-spec.js
+++ b/test/lib/template-base-spec.js
@@ -1,4 +1,3 @@
-var jasmine = require("jasmine-node");
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
@@ -15,7 +14,7 @@ describe("template-base", function () {
 
         expect(base.directory).toBe(directory);
 
-     });
+    });
 
     describe("default template options", function () {
         var testCommand;
@@ -28,16 +27,13 @@ describe("template-base", function () {
 
         });
         it("should have a --destination option", function () {
+            var command = Object.create(Template).addOptions(testCommand);
 
-                var command = Object.create(Template).addOptions(testCommand);
-
-                expect(command.optionFor("-d")).toBeDefined();
-                expect(command.optionFor("--destination")).toBeDefined();
-
+            expect(command.optionFor("-d")).toBeDefined();
+            expect(command.optionFor("--destination")).toBeDefined();
         });
 
         it("should have --package-home option", function () {
-
             var command = Object.create(Template).addOptions(testCommand);
 
             expect(command.optionFor("-p")).toBeDefined();
@@ -61,15 +57,15 @@ describe("template-base", function () {
                     "testTemplate.js": 1
                 },
                 "package_home": {
-                   "package.json": 1
+                    "package.json": 1
                 }
             });
 
             osMock = {
                 tmpDir: function() {
-                    return "/minit_home"
+                    return "/minit_home";
                 }
-            }
+            };
 
             templateConfig = {};
             templateConfig.minitHome = "/minit_home";
@@ -112,5 +108,10 @@ describe("template-base", function () {
                     expect(exists).toBe(true);
                 });
         });
+
+        it("interpolates strings correctly", function () {
+            var result = testTemplate.applyTransform("before {{replace}} after", {replace: "a/b/c"});
+            expect(result).toEqual("before a/b/c after");
+        });
     });
-});
\ No newline at end of file
+});
diff --git a/test/templates/app-spec.js b/test/templates/app-spec.js
index 93447b7..31c284f 100644
--- a/test/templates/app-spec.js
+++ b/test/templates/app-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
diff --git a/test/templates/component-spec.js b/test/templates/component-spec.js
index 5d8f8ec..534416e 100644
--- a/test/templates/component-spec.js
+++ b/test/templates/component-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
@@ -55,10 +53,10 @@ describe("component template", function () {
         });
 
         it("should have --extends-module-id option", function () {
-             var command = Object.create(Template).addOptions(testCommand);
+            var command = Object.create(Template).addOptions(testCommand);
 
-             expect(command.optionFor("--extends-module-id")).toBeDefined();
-         });
+            expect(command.optionFor("--extends-module-id")).toBeDefined();
+        });
 
         it("should have --copyright option", function () {
             var command = Object.create(Template).addOptions(testCommand);
diff --git a/test/templates/digit-spec.js b/test/templates/digit-spec.js
index 348eaac..57d76e7 100644
--- a/test/templates/digit-spec.js
+++ b/test/templates/digit-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
diff --git a/test/templates/package-spec.js b/test/templates/package-spec.js
index a4152e5..7e44c3d 100644
--- a/test/templates/package-spec.js
+++ b/test/templates/package-spec.js
@@ -1,12 +1,19 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
+var Q = require("q");
 
 describe("package template", function () {
     var testCommand;
     var Template;
+    var NpmWrapperMock;
     beforeEach(function() {
+        NpmWrapperMock = function (config) {
+            this.config = config;
+        };
+        NpmWrapperMock.prototype.install = function() {
+            return Q();
+        };
+        NpmWrapperMock.prototype.close = function() {};
 
         Template = SandboxedModule.require('../../templates/package', {
             requires: {
@@ -14,9 +21,13 @@ describe("package template", function () {
                     TemplateBase: {
                         addOptions: function(command) {
                             return command;
+                        },
+                        finish: function () {
+                            return Q();
                         }
                     }
-                }
+                },
+                '../lib/npm-wrapper': NpmWrapperMock
             }
         }).Template;
 
@@ -49,4 +60,62 @@ describe("package template", function () {
         });
     });
 
+    describe("install dependencies", function () {
+        var template;
+        beforeEach(function () {
+            template = Object.create(Template);
+        });
+
+        it("uses the npm registry if online", function () {
+            Object.defineProperty(template, "_isOnline", {
+                value: function () {
+                    return Q(true);
+                },
+            });
+            spyOn(NpmWrapperMock.prototype, "install").andCallThrough();
+
+            return template.installDependencies({})
+            .then(function () {
+                expect(NpmWrapperMock.prototype.install).toHaveBeenCalled();
+                var config = NpmWrapperMock.prototype.install.mostRecentCall.object.config;
+                expect(config.hasOwnProperty("registry")).toBe(false);
+            });
+        });
+
+        it("installs from cache if offline", function () {
+            Object.defineProperty(template, "_isOnline", {
+                value: function () {
+                    return Q(false);
+                },
+            });
+            spyOn(NpmWrapperMock.prototype, "install").andCallThrough();
+
+            return template.installDependencies({})
+            .then(function () {
+                expect(NpmWrapperMock.prototype.install).toHaveBeenCalled();
+                var config = NpmWrapperMock.prototype.install.mostRecentCall.object.config;
+                expect(config.hasOwnProperty("registry")).toBe(true);
+                expect(config.registry).toBe(null);
+            });
+        });
+
+        it("uses the npmCache option if given", function () {
+            spyOn(template, "installDependencies");
+            Object.defineProperty(template, "installDependencies", {
+                value: jasmine.createSpy().andCallFake(function () { return Q(); })
+            });
+            template.options = {
+                name: "",
+                npmCache: "pass"
+            };
+
+            return template.finish("")
+            .then(function () {
+                expect(template.installDependencies).toHaveBeenCalled();
+                expect(template.installDependencies.mostRecentCall.args[0].cache).toEqual("pass");
+            });
+        });
+
+    });
+
 });
diff --git a/test/templates/spec-spec.js b/test/templates/spec-spec.js
index 36fd2ce..0166ea6 100644
--- a/test/templates/spec-spec.js
+++ b/test/templates/spec-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
@@ -64,4 +62,4 @@ describe("spec template", function () {
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/test/templates/test-spec.js b/test/templates/test-spec.js
index 4b9b3f0..b5b4e32 100644
--- a/test/templates/test-spec.js
+++ b/test/templates/test-spec.js
@@ -1,5 +1,3 @@
-var jasmine = require("jasmine-node");
-
 var SandboxedModule = require('sandboxed-module');
 var Command = require("commander").Command;
 
@@ -65,4 +63,4 @@ describe("test template", function () {
         });
     });
 
-});
\ No newline at end of file
+});