diff --git a/Makefile b/Makefile
index 986e4d8e3..43d50197c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,3 +43,6 @@ font-awesome:
 
 vis:
 	$(GIT_SUBTREE) --prefix=lib/vis https://github.com/almende/vis.git master
+
+typeahead:
+	$(GIT_SUBTREE) -- prefix=lib/typeahead https://github.com/twitter/typeahead.js.git master
diff --git a/html/css/styles.css b/html/css/styles.css
index c788d57a3..5846651d6 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1560,20 +1560,6 @@ tr.search:nth-child(odd) {
     overflow-x: hidden;
 }
 
-.tt-dropdown-menu
-{
-    min-width: 500px;
-    left: -400px !important;
-}
-
-.twitter-typeahead .tt-hint {
-    display: block;
-    height: 34px;
-    padding: 8px 12px;
-    font-size: 14px;
-    line-height: 1.428571429;
-    border: 1px solid transparent;
-}
 
 .ui-autocomplete {
     max-height: 100px;
@@ -1610,3 +1596,42 @@ tr.search:nth-child(odd) {
     display:block;
     min-width: 75%;
 }
+
+.tt-menu {
+  position: absolute;
+  top: 95%;
+  left: 2.5%;
+  z-index: 100;
+  display: none;
+  min-width: 400px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #fff;
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+          box-shadow: 0px 0px 0px 1px green;
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+          box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-open {
+  position: absolute;
+  top: 95%;
+  left: 2.5%;
+  z-index: 100;
+  display: none;
+  min-width: 400px;
+  left: -400px !important;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #fff;
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+          box-shadow: 0px 0px 0px 1px green;
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+          box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 4f5215cd1..c3da47f95 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -463,9 +463,9 @@ if(is_file("includes/print-menubar-custom.inc.php"))
 ?>
 
     </ul>
-     <form role="search" class="navbar-form navbar-right">
+     <form role="search" class="navbar-form navbar-right global-search">
          <div class="form-group">
-             <input class="form-control" type="search" id="gsearch" name="gsearch" placeholder="Global Search">
+             <input class="form-control typeahead" type="search" id="gsearch" name="gsearch" placeholder="Global Search">
          </div>
      </form>
     <ul class="nav navbar-nav navbar-right">
@@ -552,30 +552,111 @@ if ($_SESSION['authenticated'])
  </div>
 </nav>
 <script>
-  $('#gsearch').typeahead([
-    {
-      name: 'devices',
-      remote : 'ajax_search.php?search=%QUERY&type=device',
-      header : '<h5><strong>&nbsp;Devices</strong></h5>',
-      template: '<a href="{{url}}"><p><img src="{{device_image}}" border="0" class="img_left"> <small><strong>{{name}}</strong> | {{device_os}} | {{version}} | {{device_hardware}} with {{device_ports}} port(s) | {{location}}</small></p></a>',
-      valueKey:"name",
-      engine: Hogan
-    },
-    {
-      name: 'ports',
-      remote : 'ajax_search.php?search=%QUERY&type=ports',
-      header : '<h5><strong>&nbsp;Ports</strong></h5>',
-      template: '<a href="{{url}}"><p><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}}<br /><i>{{description}}</i></small></p></a>',
-      valueKey: "name",
-      engine: Hogan
-    },
-    {
-      name: 'bgp',
-      remote : 'ajax_search.php?search=%QUERY&type=bgp',
-      header : '<h5><strong>&nbsp;BGP</strong></h5>',
-      template: '<a href="{{url}}"><p><small><img src="{{bgp_image}}" border="0" class="img_left">{{name}} - {{hostname}}<br />AS{{localas}} -> AS{{remoteas}}</small></p></a>',
-      valueKey: "name",
-      engine: Hogan
+var devices = new Bloodhound({
+  datumTokenizer: Bloodhound.tokenizers.obj.whitespace('device_id'),
+  queryTokenizer: Bloodhound.tokenizers.whitespace,
+  remote: {
+      url: "ajax_search.php?search=%QUERY&type=device",
+        filter: function (devices) {
+            return $.map(devices, function (device) {
+                return {
+                    device_id: device.device_id,
+                    device_image: device.device_image,
+                    url: device.url,
+                    name: device.name,
+                    device_os: device.device_os,
+                    version: device.version,
+                    device_hardware: device.device_hardware,
+                    device_ports: device.device_ports,
+                    location: device.location
+                };
+            });
+        },
+      wildcard: "%QUERY"
+  }
+});
+var ports = new Bloodhound({
+  datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
+  queryTokenizer: Bloodhound.tokenizers.whitespace,
+  remote: {
+      url: "ajax_search.php?search=%QUERY&type=ports",
+        filter: function (ports) {
+            return $.map(ports, function (port) {
+                return {
+                    count: port.count,
+                    url: port.url,
+                    name: port.name,
+                    description: port.description,
+                    colours: port.colours,
+                    hostname: port.hostname
+                };
+            });
+        },
+      wildcard: "%QUERY"
+  }
+});
+var bgp = new Bloodhound({
+  datumTokenizer: Bloodhound.tokenizers.obj.whitespace('name'),
+  queryTokenizer: Bloodhound.tokenizers.whitespace,
+  remote: {
+      url: "ajax_search.php?search=%QUERY&type=bgp",
+        filter: function (bgp_sessions) {
+            return $.map(bgp_sessions, function (bgp) {
+                return {
+                    count: bgp.count,
+                    url: bgp.url,
+                    name: bgp.name,
+                    description: bgp.description,
+                    localas: bgp.localas,
+                    bgp_image: bgp.bgp_image,
+                    remoteas: bgp.remoteas,
+                    colours: bgp.colours,
+                    hostname: bgp.hostname
+                };
+            });
+        },
+      wildcard: "%QUERY"
+  }
+});
+
+devices.initialize();
+ports.initialize();
+$('#gsearch').typeahead({
+    hint: true,
+    highlight: true,
+    minLength: 1
+},
+{
+  source: devices.ttAdapter(),
+  async: true,
+  disaply: name,
+  limit: 8,
+    templates: {
+        header: '<h5><strong>&nbsp;Devices</strong></h5>',
+        suggestion: Handlebars.compile('<p><a href="{{url}}"><img src="{{device_image}}" border="0" class="img_left"> <small><strong>{{name}}</strong> | {{device_os}} | {{version}} | {{device_hardware}} with {{device_ports}} port(s) | {{location}}</small></a></p>')
     }
-  ]);
+},
+{
+  source: ports.ttAdapter(),
+  async: true,
+  disaply: name,
+  limit: 8,
+    templates: {
+        header: '<h5><strong>&nbsp;Ports</strong></h5>',
+        suggestion: Handlebars.compile('<a href="{{url}}"><p><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}}<br /><i>{{description}}</i></small></p></a>')
+    }
+},
+{
+  source: bgp.ttAdapter(),
+  async: true,
+  disaply: name,
+  limit: 8,
+    templates: {
+        header: '<h5><strong>&nbsp;BGP Sessions</strong></h5>',
+        suggestion: Handlebars.compile('<a href="{{url}}"><p><small><img src="{{bgp_image}}" border="0" class="img_left">{{name}} - {{hostname}}<br />AS{{localas}} -> AS{{remoteas}}</small></p></a>')
+    }
+});
+$('#gsearch').bind('typeahead:open', function(ev, suggestion) {
+    $('#gsearch').addClass('search-box');
+});
 </script>
diff --git a/html/index.php b/html/index.php
index 9f2a84708..71b2c0eaa 100644
--- a/html/index.php
+++ b/html/index.php
@@ -128,7 +128,6 @@ if (empty($config['favicon'])) {
   <link href="css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css" />
   <link href="css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
   <link href="css/toastr.min.css" rel="stylesheet" type="text/css" />
-  <link href="css/typeahead.js-bootstrap.css" rel="stylesheet" type="text/css" />
   <link href="css/jquery-ui.min.css" rel="stylesheet" type="text/css" />
   <link href="css/jquery.bootgrid.min.css" rel="stylesheet" type="text/css" />
   <link href="css/tagmanager.css" rel="stylesheet" type="text/css" />
@@ -145,11 +144,12 @@ if (empty($config['favicon'])) {
   <script src="js/jquery.cycle2.min.js"></script>
   <script src="js/moment.min.js"></script>
   <script src="js/bootstrap-datetimepicker.min.js"></script>
-  <script src="js/typeahead.min.js"></script>
+  <script src="js/typeahead.bundle.min.js"></script>
   <script src="js/jquery-ui.min.js"></script>
   <script src="js/tagmanager.js"></script>
   <script src="js/mktree.js"></script>
   <script src="js/jquery.bootgrid.min.js"></script>
+  <script src="js/handlebars.min.js"></script>
   <script type="text/javascript">
 
     <!-- Begin
diff --git a/lib/handlebars/.eslintrc b/lib/handlebars/.eslintrc
deleted file mode 100644
index 253a1bb29..000000000
--- a/lib/handlebars/.eslintrc
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "globals": {
-    "self": false
-  },
-  "env": {
-    "node": true
-  },
-  "ecmaFeatures": {
-    // Enabling features that can be implemented without polyfills. Want to avoid polyfills at this time.
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": true,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "spread": true,
-    "templateStrings": true
-  },
-  "rules": {
-    // Possible Errors //
-    //-----------------//
-
-    "comma-dangle": [2, "never"],
-    "no-cond-assign": [2, "except-parens"],
-
-    // Allow for debugging
-    "no-console": 1,
-
-    "no-constant-condition": 2,
-    "no-control-regex": 2,
-
-    // Allow for debugging
-    "no-debugger": 1,
-
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty": 2,
-    "no-empty-class": 2,
-    "no-ex-assign": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": 0,
-    "no-extra-semi": 2,
-    "no-func-assign": 2,
-
-    // Stylistic... might consider disallowing in the future
-    "no-inner-declarations": 0,
-
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-negated-in-lhs": 2,
-    "no-obj-calls": 2,
-    "no-regex-spaces": 2,
-    "no-reserved-keys": 2,    // Important for IE
-    "no-sparse-arrays": 0,
-
-    // Optimizer and coverage will handle/highlight this and can be useful for debugging
-    "no-unreachable": 1,
-
-    "use-isnan": 2,
-    "valid-jsdoc": 0,
-    "valid-typeof": 2,
-
-
-    // Best Practices //
-    //----------------//
-    "block-scoped-var": 0,
-    "complexity": 0,
-    "consistent-return": 0,
-    "curly": 2,
-    "default-case": 1,
-    "dot-notation": [2, {"allowKeywords": false}],
-    "eqeqeq": 0,
-    "guard-for-in": 1,
-    "no-alert": 2,
-    "no-caller": 2,
-    "no-div-regex": 1,
-    "no-else-return": 0,
-    "no-empty-label": 2,
-    "no-eq-null": 0,
-    "no-eval": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-implied-eval": 2,
-    "no-iterator": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-loop-func": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 1,
-    "no-native-reassign": 2,
-    "no-new": 2,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-param-reassign": 0,
-    "no-process-env": 2,
-    "no-proto": 2,
-    "no-redeclare": 2,
-    "no-return-assign": 2,
-    "no-script-url": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-throw-literal": 2,
-    "no-unused-expressions": 2,
-    "no-void": 0,
-    "no-warning-comments": 1,
-    "no-with": 2,
-    "radix": 2,
-    "vars-on-top": 0,
-    "wrap-iife": 2,
-    "yoda": 0,
-
-
-    // Strict //
-    //--------//
-    "strict": 0,
-
-
-    // Variables //
-    //-----------//
-    "no-catch-shadow": 2,
-    "no-delete-var": 2,
-    "no-label-var": 2,
-    "no-shadow": 2,
-    "no-shadow-restricted-names": 2,
-    "no-undef": 2,
-    "no-undef-init": 2,
-    "no-undefined": 0,
-    "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],    
-    "no-use-before-define": [2, "nofunc"],
-
-
-    // Node.js //
-    //---------//
-    // Others left to environment defaults
-    "no-mixed-requires": 0,
-
-
-    // Stylistic //
-    //-----------//
-    "indent": 0,
-    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
-    "camelcase": 2,
-    "comma-spacing": [2, {"before": false, "after": true}],
-    "comma-style": [2, "last"],
-    "consistent-this": [1, "self"],
-    "eol-last": 2,
-    "func-names": 0,
-    "func-style": [2, "declaration"],
-    "key-spacing": [2, {
-        "beforeColon": false,
-        "afterColon": true
-    }],
-    "max-nested-callbacks": 0,
-    "new-cap": 2,
-    "new-parens": 2,
-    "newline-after-var": 0,
-    "no-array-constructor": 2,
-    "no-continue": 0,
-    "no-inline-comments": 0,
-    "no-lonely-if": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": 0,
-    "no-nested-ternary": 1,
-    "no-new-object": 2,
-    "no-spaced-func": 2,
-    "no-ternary": 0,
-    "no-trailing-spaces": 2,
-    "no-underscore-dangle": 0,
-    "no-wrap-func": 2,
-    "one-var": 0,
-    "operator-assignment": 0,
-    "padded-blocks": 0,
-    "quote-props": 0,
-    "quotes": [2, "single", "avoid-escape"],
-    "semi": 2,
-    "semi-spacing": [2, {"before": false, "after": true}],
-    "sort-vars": 0,
-    "space-after-keywords": [2, "always"],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
-    "space-in-brackets": 0,
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-return-throw-case": 2,
-    "space-unary-ops": 2,
-    "spaced-line-comment": 2,
-    "wrap-regex": 1,
-
-    "no-var": 1
-  }
-}
\ No newline at end of file
diff --git a/lib/handlebars/.gitignore b/lib/handlebars/.gitignore
deleted file mode 100644
index 3c6d099f1..000000000
--- a/lib/handlebars/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-vendor
-.rvmrc
-.DS_Store
-lib/handlebars/compiler/parser.js
-/dist/
-/tmp/
-/coverage/
-node_modules
-*.sublime-project
-*.sublime-workspace
-npm-debug.log
-sauce_connect.log*
diff --git a/lib/handlebars/.gitmodules b/lib/handlebars/.gitmodules
deleted file mode 100644
index 1739275a8..000000000
--- a/lib/handlebars/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "spec/mustache"]
-	path = spec/mustache
-	url = git://github.com/mustache/spec.git
diff --git a/lib/handlebars/.istanbul.yml b/lib/handlebars/.istanbul.yml
deleted file mode 100644
index e6911f190..000000000
--- a/lib/handlebars/.istanbul.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-instrumentation:
-    excludes: ['**/spec/**']
diff --git a/lib/handlebars/.npmignore b/lib/handlebars/.npmignore
deleted file mode 100644
index f10592c0f..000000000
--- a/lib/handlebars/.npmignore
+++ /dev/null
@@ -1,25 +0,0 @@
-.DS_Store
-.gitignore
-.rvmrc
-.eslintrc
-.travis.yml
-.rspec
-Gemfile
-Gemfile.lock
-Rakefile
-Gruntfile.js
-*.gemspec
-*.nuspec
-*.log
-bench/*
-configurations/*
-components/*
-coverage/*
-dist/cdnjs/*
-dist/components/*
-spec/*
-src/*
-tasks/*
-tmp/*
-publish/*
-vendor/*
diff --git a/lib/handlebars/.travis.yml b/lib/handlebars/.travis.yml
deleted file mode 100644
index ecbc1a435..000000000
--- a/lib/handlebars/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: node_js
-before_install:
-- npm install -g grunt-cli
-script:
-- grunt --stack travis
-email:
-  on_failure: change
-  on_success: never
-env:
-  global:
-  - S3_BUCKET_NAME=builds.handlebarsjs.com
-  - secure: ckyEe5dzjdFDjmZ6wIrhGm0CFBEnKq8c1dYptfgVV/Q5/nJFGzu8T0yTjouS/ERxzdT2H327/63VCxhFnLCRHrsh4rlW/rCy4XI3O/0TeMLgFPa4TXkO8359qZ4CB44TBb3NsJyQXNMYdJpPLTCVTMpuiqqkFFOr+6OeggR7ufA=
-  - secure: Nm4AgSfsgNB21kgKrF9Tl7qVZU8YYREhouQunFracTcZZh2NZ2XH5aHuSiXCj88B13Cr/jGbJKsZ4T3QS3wWYtz6lkyVOx3H3iI+TMtqhD9RM3a7A4O+4vVN8IioB2YjhEu0OKjwgX5gp+0uF+pLEi7Hpj6fupD3AbbL5uYcKg8=
-matrix:
-  include:
-  - node_js: '0.10'
-    env:
-    - PUBLISH=true
-    - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw=
-    - secure: yERYCf7AwL11D9uMtacly/THGV8BlzsMmrt+iQVvGA3GaY6QMmfYqf6P6cCH98sH5etd1Y+1e6YrPeMjqI6lyRllT7FptoyOdHulazQe86VQN4sc0EpqMlH088kB7gGjTut9Z+X9ViooT5XEh9WA5jXEI9pXhQJNoIHkWPuwGuY=
-cache:
-  directories:
-  - node_modules
diff --git a/lib/handlebars/CONTRIBUTING.md b/lib/handlebars/CONTRIBUTING.md
deleted file mode 100644
index b84fdb005..000000000
--- a/lib/handlebars/CONTRIBUTING.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# How to Contribute
-
-## Reporting Issues
-
-Please see our [FAQ](https://github.com/wycats/handlebars.js/blob/master/FAQ.md) for common issues that people run into.
-
-Should you run into other issues with the project, please don't hesitate to let us know by filing an [issue][issue]! In general we are going to ask for an example of the problem failing, which can be as simple as a jsfiddle/jsbin/etc. We've put together a jsfiddle [template][jsfiddle] to ease this. (We will keep this link up to date as new releases occur, so feel free to check back here)
-
-Pull requests containing only failing thats demonstrating the issue are welcomed and this also helps ensure that your issue won't regress in the future once it's fixed.
-
-Documentation issues on the handlebarsjs.com site should be reported on [handlebars-site](https://github.com/wycats/handlebars-site).
-
-## Pull Requests
-
-We also accept [pull requests][pull-request]!
-
-Generally we like to see pull requests that
-- Maintain the existing code style
-- Are focused on a single change (i.e. avoid large refactoring or style adjustments in untouched code if not the primary goal of the pull request)
-- Have [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-- Have tests
-- Don't significantly decrease the current code coverage (see coverage/lcov-report/index.html)
-
-## Building
-
-To build Handlebars.js you'll need a few things installed.
-
-* Node.js
-* [Grunt](http://gruntjs.com/getting-started)
-
-Before building, you need to make sure that the Git submodule `spec/mustache` is included (i.e. the directory `spec/mustache` should not be empty). To include it, if using Git version 1.6.5 or newer, use `git clone --recursive` rather than `git clone`. Or, if you already cloned without `--recursive`, use `git submodule update --init`.
-
-Project dependencies may be installed via `npm install`.
-
-To build Handlebars.js from scratch, you'll want to run `grunt`
-in the root of the project. That will build Handlebars and output the
-results to the dist/ folder. To re-run tests, run `grunt test` or `npm test`.
-You can also run our set of benchmarks with `grunt bench`.
-
-The `grunt dev` implements watching for tests and allows for in browser testing at `http://localhost:9999/spec/`.
-
-If you notice any problems, please report them to the GitHub issue tracker at
-[http://github.com/wycats/handlebars.js/issues](http://github.com/wycats/handlebars.js/issues).
-
-## Ember testing
-
-The current ember distribution should be tested as part of the handlebars release process. This requires building the `handlebars-source` gem locally and then executing the ember test script.
-
-```sh
-npm link
-grunt build release
-cp dist/*.js $emberRepoDir/bower_components/handlebars/
-
-cd $emberRepoDir
-npm link handlebars
-npm test
-```
-
-## Releasing
-
-Handlebars utilizes the [release yeoman generator][generator-release] to perform most release tasks.
-
-A full release may be completed with the following:
-
-```
-yo release
-npm publish
-yo release:publish components handlebars.js dist/components/
-
-cd dist/components/
-gem build handlebars-source.gemspec
-gem push handlebars-source-*.gem
-```
-
-After this point the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
-
-[generator-release]: https://github.com/walmartlabs/generator-release
-[pull-request]: https://github.com/wycats/handlebars.js/pull/new/master
-[issue]: https://github.com/wycats/handlebars.js/issues/new
-[jsfiddle]: http://jsfiddle.net/9D88g/26/
diff --git a/lib/handlebars/FAQ.md b/lib/handlebars/FAQ.md
deleted file mode 100644
index 108e839af..000000000
--- a/lib/handlebars/FAQ.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Frequently Asked Questions
-
-1. How can I file a bug report:
-
-  See our guidelines on [reporting issues](https://github.com/wycats/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
-
-1. Why isn't my Mustache template working?
-
-  Handlebars deviates from Mustache slightly on a few behaviors. These variations are documented in our [readme](https://github.com/wycats/handlebars.js#differences-between-handlebarsjs-and-mustache).
-
-1. Why is it slower when compiling?
-
-  The Handlebars compiler must parse the template and construct a JavaScript program which can then be run. Under some environments such as older mobile devices this can have a performance impact which can be avoided by precompiling. Generally it's recommended that precompilation and the runtime library be used on all clients.
-
-1. Why doesn't this work with Content Security Policy restrictions?
-
-  When not using the precompiler, Handlebars generates a dynamic function for each template which can cause issues with pages that have enabled Content Policy. It's recommended that templates are precompiled or the `unsafe-eval` policy is enabled for sites that must generate dynamic templates at runtime.
-
-1. How can I include script tags in my template?
-
-  If loading the template via an inlined `<script type="text/x-handlebars">` tag then you may need to break up the script tag with an empty comment to avoid browser parser errors:
-
-  ```html
-  <script type="text/x-handlebars">
-    foo
-    <scr{{!}}ipt src="bar"></scr{{!}}ipt>
-  </script>
-  ```
-
-  It's generally recommended that templates are served through external, precompiled, files, which do not suffer from this issue.
-
-1. Why are my precompiled scripts throwing exceptions?
-
-  When using the precompiler, it's important that a supporting version of the Handlebars runtime be loaded on the target page. In version 1.x there were rudimentary checks to compare the version but these did not always work. This is fixed under 2.x but the version checking does not work between these two versions. If you see unexpected errors such as `undefined is not a function` or similar, please verify that the same version is being used for both the precompiler and the client. This can be checked via:
-
-  ```sh
-  handlebars --version
-  ```
-  If using the integrated precompiler and
-
-  ```javascript
-  console.log(Handlebars.VERSION);
-  ```
-  On the client side.
-
-  We include the built client libraries in the npm package for those who want to be certain that they are using the same client libraries as the compiler.
-
-  Should these match, please file an issue with us, per our [issue filing guidelines](https://github.com/wycats/handlebars.js/blob/master/CONTRIBUTING.md#reporting-issues).
-
-1. Why doesn't IE like the `default` name in the AMD module?
-
-  Some browsers such as particular versions of IE treat `default` as a reserved word in JavaScript source files. To safely use this you need to reference this via the `Handlebars['default']` lookup method. This is an unfortunate side effect of the shims necessary to backport the Handlebars ES6 code to all current browsers.
-
-1. How do I load the runtime library when using AMD?
-
-  There are two options for loading under AMD environments. The first is to use the `handlebars.runtime.amd.js` file. This may require a [path mapping](https://github.com/wycats/handlebars.js/blob/master/spec/amd-runtime.html#L31) as well as access via the `default` field.
-
-  The other option is to load the `handlebars.runtime.js` UMD build, which might not require path configuration and exposes the library as both the module root and the `default` field for compatibility. 
-
-  If not using ES6 transpilers or accessing submodules in the build the former option should be sufficient for most use cases.
diff --git a/lib/handlebars/Gruntfile.js b/lib/handlebars/Gruntfile.js
deleted file mode 100644
index 70239bf8b..000000000
--- a/lib/handlebars/Gruntfile.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/*eslint-disable no-process-env */
-module.exports = function(grunt) {
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-
-    eslint: {
-      options: {
-      },
-      files: [
-        '*.js',
-        'lib/**/!(*.min|parser).js',
-        'spec/**/!(*.amd|json2|require).js'
-      ]
-    },
-
-    clean: ['tmp', 'dist', 'lib/handlebars/compiler/parser.js'],
-
-    copy: {
-      dist: {
-        options: {
-          processContent: function(content) {
-            return grunt.template.process('/*!\n\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n@license\n*/\n')
-                + content;
-          }
-        },
-        files: [
-          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/'}
-        ]
-      },
-      cdnjs: {
-        files: [
-          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/cdnjs'}
-        ]
-      },
-      components: {
-        files: [
-          {expand: true, cwd: 'components/', src: ['**'], dest: 'dist/components'},
-          {expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/components'}
-        ]
-      }
-    },
-
-    babel: {
-      options: {
-        loose: ['es6.modules']
-      },
-      amd: {
-        options: {
-          modules: 'amd'
-        },
-        files: [{
-          expand: true,
-          cwd: 'lib/',
-          src: '**/!(index).js',
-          dest: 'dist/amd/'
-        }]
-      },
-
-      cjs: {
-        options: {
-          modules: 'common'
-        },
-        files: [{
-          cwd: 'lib/',
-          expand: true,
-          src: '**/!(index).js',
-          dest: 'dist/cjs/'
-        }]
-      }
-    },
-    webpack: {
-      options: {
-        context: __dirname,
-        module: {
-          loaders: [
-            // the optional 'runtime' transformer tells babel to require the runtime instead of inlining it.
-            { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime&loose=es6.modules' }
-          ]
-        },
-        output: {
-          path: 'dist/',
-          library: 'Handlebars',
-          libraryTarget: 'umd'
-        }
-      },
-      handlebars: {
-        entry: './lib/handlebars.js',
-        output: {
-          filename: 'handlebars.js'
-        }
-      },
-      runtime: {
-        entry: './lib/handlebars.runtime.js',
-        output: {
-          filename: 'handlebars.runtime.js'
-        }
-      }
-    },
-
-    requirejs: {
-      options: {
-        optimize: 'none',
-        baseUrl: 'dist/amd/'
-      },
-      dist: {
-        options: {
-          name: 'handlebars',
-          out: 'dist/handlebars.amd.js'
-        }
-      },
-      runtime: {
-        options: {
-          name: 'handlebars.runtime',
-          out: 'dist/handlebars.runtime.amd.js'
-        }
-      }
-    },
-
-    uglify: {
-      options: {
-        mangle: true,
-        compress: true,
-        preserveComments: 'some'
-      },
-      dist: {
-        files: [{
-          cwd: 'dist/',
-          expand: true,
-          src: ['handlebars*.js', '!*.min.js'],
-          dest: 'dist/',
-          rename: function(dest, src) {
-            return dest + src.replace(/\.js$/, '.min.js');
-          }
-        }]
-      }
-    },
-
-    concat: {
-      tests: {
-        src: ['spec/!(require).js'],
-        dest: 'tmp/tests.js'
-      }
-    },
-
-    connect: {
-      server: {
-        options: {
-          base: '.',
-          hostname: '*',
-          port: 9999
-        }
-      }
-    },
-    'saucelabs-mocha': {
-      all: {
-        options: {
-          build: process.env.TRAVIS_JOB_ID,
-          urls: ['http://localhost:9999/spec/?headless=true', 'http://localhost:9999/spec/amd.html?headless=true'],
-          detailedError: true,
-          concurrency: 2,
-          browsers: [
-            {browserName: 'chrome'},
-            {browserName: 'firefox'},
-            {browserName: 'safari', version: 7, platform: 'OS X 10.9'},
-            {browserName: 'safari', version: 6, platform: 'OS X 10.8'},
-            {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
-            {browserName: 'internet explorer', version: 10, platform: 'Windows 8'},
-            {browserName: 'internet explorer', version: 9, platform: 'Windows 7'}
-          ]
-        }
-      },
-      sanity: {
-        options: {
-          build: process.env.TRAVIS_JOB_ID,
-          urls: ['http://localhost:9999/spec/umd.html?headless=true', 'http://localhost:9999/spec/amd-runtime.html?headless=true', 'http://localhost:9999/spec/umd-runtime.html?headless=true'],
-          detailedError: true,
-          concurrency: 2,
-          browsers: [
-            {browserName: 'chrome'}
-          ]
-        }
-      }
-    },
-
-    watch: {
-      scripts: {
-        options: {
-          atBegin: true
-        },
-
-        files: ['src/*', 'lib/**/*.js', 'spec/**/*.js'],
-        tasks: ['build', 'amd', 'tests', 'test']
-      }
-    }
-  });
-
-  // Build a new version of the library
-  this.registerTask('build', 'Builds a distributable version of the current project', [
-                    'eslint',
-                    'parser',
-                    'node',
-                    'globals']);
-
-  this.registerTask('amd', ['babel:amd', 'requirejs']);
-  this.registerTask('node', ['babel:cjs']);
-  this.registerTask('globals', ['webpack']);
-  this.registerTask('tests', ['concat:tests']);
-
-  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
-
-  // Load tasks from npm
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-babel');
-  grunt.loadNpmTasks('grunt-eslint');
-  grunt.loadNpmTasks('grunt-saucelabs');
-  grunt.loadNpmTasks('grunt-webpack');
-
-  grunt.task.loadTasks('tasks');
-
-  grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : []);
-
-  grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'sauce', 'metrics', 'publish:latest'] : ['default']);
-
-  grunt.registerTask('dev', ['clean', 'connect', 'watch']);
-  grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-};
diff --git a/lib/handlebars/LICENSE b/lib/handlebars/LICENSE
deleted file mode 100644
index a2d22cbb4..000000000
--- a/lib/handlebars/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011-2014 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/handlebars/README.markdown b/lib/handlebars/README.markdown
deleted file mode 100644
index d6aa6bd5c..000000000
--- a/lib/handlebars/README.markdown
+++ /dev/null
@@ -1,438 +0,0 @@
-[![Travis Build Status](https://img.shields.io/travis/wycats/handlebars.js/master.svg)](https://travis-ci.org/wycats/handlebars.js)
-[![Selenium Test Status](https://saucelabs.com/buildstatus/handlebars)](https://saucelabs.com/u/handlebars)
-
-Handlebars.js
-=============
-
-Handlebars.js is an extension to the [Mustache templating
-language](http://mustache.github.com/) created by Chris Wanstrath.
-Handlebars.js and Mustache are both logicless templating languages that
-keep the view and the code separated like we all know they should be.
-
-Checkout the official Handlebars docs site at
-[http://www.handlebarsjs.com](http://www.handlebarsjs.com).
-
-Installing
-----------
-Installing Handlebars is easy. Simply download the package [from the official site](http://handlebarsjs.com/) or the [bower repository][bower-repo] and add it to your web pages (you should usually use the most recent version).
-
-For web browsers, a free CDN is available at [jsDelivr](http://www.jsdelivr.com/#!handlebarsjs).  Advanced usage, such as [version aliasing & concocting](https://github.com/jsdelivr/jsdelivr#usage), is available. 
-
-Alternatively, if you prefer having the latest version of handlebars from
-the 'master' branch, passing builds of the 'master' branch are automatically
-published to S3. You may download the latest passing master build by grabbing
-a `handlebars-latest.js` file from the [builds page][builds-page]. When the
-build is published, it is also available as a `handlebars-gitSHA.js` file on
-the builds page if you need a version to refer to others.
-`handlebars-runtime.js` builds are also available.
-
-**Note**: The S3 builds page is provided as a convenience for the community,
-but you should not use it for hosting Handlebars in production.
-
-Usage
------
-In general, the syntax of Handlebars.js templates is a superset
-of Mustache templates. For basic syntax, check out the [Mustache
-manpage](http://mustache.github.com/mustache.5.html).
-
-Once you have a template, use the `Handlebars.compile` method to compile
-the template into a function. The generated function takes a context
-argument, which will be used to render the template.
-
-```js
-var source = "<p>Hello, my name is {{name}}. I am from {{hometown}}. I have " +
-             "{{kids.length}} kids:</p>" +
-             "<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>";
-var template = Handlebars.compile(source);
-
-var data = { "name": "Alan", "hometown": "Somewhere, TX",
-             "kids": [{"name": "Jimmy", "age": "12"}, {"name": "Sally", "age": "4"}]};
-var result = template(data);
-
-// Would render:
-// <p>Hello, my name is Alan. I am from Somewhere, TX. I have 2 kids:</p>
-// <ul>
-//   <li>Jimmy is 12</li>
-//   <li>Sally is 4</li>
-// </ul>
-```
-
-
-Registering Helpers
--------------------
-
-You can register helpers that Handlebars will use when evaluating your
-template. Here's an example, which assumes that your objects have a URL
-embedded in them, as well as the text for a link:
-
-```js
-Handlebars.registerHelper('link_to', function() {
-  return new Handlebars.SafeString("<a href='" + Handlebars.Utils.escapeExpression(this.url) + "'>" + Handlebars.Utils.escapeExpression(this.body) + "</a>");
-});
-
-var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
-var source = "<ul>{{#posts}}<li>{{link_to}}</li>{{/posts}}</ul>"
-
-var template = Handlebars.compile(source);
-template(context);
-
-// Would render:
-//
-// <ul>
-//   <li><a href='/hello-world'>Hello World!</a></li>
-// </ul>
-```
-
-Helpers take precedence over fields defined on the context. To access a field
-that is masked by a helper, a path reference may be used. In the example above
-a field named `link_to` on the `context` object would be referenced using:
-
-```
-{{./link_to}}
-```
-
-Escaping
---------
-
-By default, the `{{expression}}` syntax will escape its contents. This
-helps to protect you against accidental XSS problems caused by malicious
-data passed from the server as JSON.
-
-To explicitly *not* escape the contents, use the triple-mustache
-(`{{{}}}`). You have seen this used in the above example.
-
-
-Differences Between Handlebars.js and Mustache
-----------------------------------------------
-Handlebars.js adds a couple of additional features to make writing
-templates easier and also changes a tiny detail of how partials work.
-
-### Paths
-
-Handlebars.js supports an extended expression syntax that we call paths.
-Paths are made up of typical expressions and `.` characters. Expressions
-allow you to not only display data from the current context, but to
-display data from contexts that are descendants and ancestors of the
-current context.
-
-To display data from descendant contexts, use the `.` character. So, for
-example, if your data were structured like:
-
-```js
-var data = {"person": { "name": "Alan" }, "company": {"name": "Rad, Inc." } };
-```
-
-You could display the person's name from the top-level context with the
-following expression:
-
-```
-{{person.name}}
-```
-
-You can backtrack using `../`. For example, if you've already traversed
-into the person object you could still display the company's name with
-an expression like `{{../company.name}}`, so:
-
-```
-{{#with person}}{{name}} - {{../company.name}}{{/with}}
-```
-
-would render:
-
-```
-Alan - Rad, Inc.
-```
-
-### Strings
-
-When calling a helper, you can pass paths or Strings as parameters. For
-instance:
-
-```js
-Handlebars.registerHelper('link_to', function(title, options) {
-  return "<a href='/posts" + this.url + "'>" + title + "!</a>"
-});
-
-var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
-var source = '<ul>{{#posts}}<li>{{{link_to "Post"}}}</li>{{/posts}}</ul>'
-
-var template = Handlebars.compile(source);
-template(context);
-
-// Would render:
-//
-// <ul>
-//   <li><a href='/posts/hello-world'>Post!</a></li>
-// </ul>
-```
-
-When you pass a String as a parameter to a helper, the literal String
-gets passed to the helper function.
-
-
-### Block Helpers
-
-Handlebars.js also adds the ability to define block helpers. Block
-helpers are functions that can be called from anywhere in the template.
-Here's an example:
-
-```js
-var source = "<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>";
-Handlebars.registerHelper('link', function(options) {
-  return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
-});
-var template = Handlebars.compile(source);
-
-var data = { "people": [
-    { "name": "Alan", "id": 1 },
-    { "name": "Yehuda", "id": 2 }
-  ]};
-template(data);
-
-// Should render:
-// <ul>
-//   <li><a href="/people/1">Alan</a></li>
-//   <li><a href="/people/2">Yehuda</a></li>
-// </ul>
-```
-
-Whenever the block helper is called it is given one or more parameters,
-any arguments that are passed into the helper in the call, and an `options`
-object containing the `fn` function which executes the block's child.
-The block's current context may be accessed through `this`.
-
-Block helpers have the same syntax as mustache sections but should not be
-confused with one another. Sections are akin to an implicit `each` or
-`with` statement depending on the input data and helpers are explicit
-pieces of code that are free to implement whatever behavior they like.
-The [mustache spec](http://mustache.github.io/mustache.5.html)
-defines the exact behavior of sections. In the case of name conflicts,
-helpers are given priority.
-
-### Partials
-
-You can register additional templates as partials, which will be used by
-Handlebars when it encounters a partial (`{{> partialName}}`). Partials
-can either be String templates or compiled template functions. Here's an
-example:
-
-```js
-var source = "<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>";
-
-Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>')
-var template = Handlebars.compile(source);
-
-var data = { "people": [
-    { "name": "Alan", "id": 1 },
-    { "name": "Yehuda", "id": 2 }
-  ]};
-
-template(data);
-
-// Should render:
-// <ul>
-//   <li><a href="/people/1">Alan</a></li>
-//   <li><a href="/people/2">Yehuda</a></li>
-// </ul>
-```
-
-Partials can also accept parameters
-
-```js
-var source = "<div>{{> roster rosterProperties people=listOfPeople}}</div>";
-
-Handlebars.registerPartial('roster', '<h2>{{rosterName}}</h2>{{#people}}<span>{{id}}: {{name}}</span>{{/people}}')
-var template = Handlebars.compile(source);
-
-var data = {
-	"listOfPeople": [
-		{ "name": "Alan", "id": 1 },
-		{ "name": "Yehuda", "id": 2 }
-	], 
-	"rosterProperties": {
-		"rosterName": "Cool People"
-	}
-};
-
-template(data);
-
-// Should render:
-// <div>
-//  <h2>Cool People</h2>
-//   <span>1: Alan</span>
-//   <span>2: Yehuda</span>
-// </div>
-
-```
-
-### Comments
-
-You can add comments to your templates with the following syntax:
-
-```js
-{{! This is a comment }}
-```
-
-You can also use real html comments if you want them to end up in the output.
-
-```html
-<div>
-    {{! This comment will not end up in the output }}
-    <!-- This comment will show up in the output -->
-</div>
-```
-
-
-### Compatibility
-
-There are a few Mustache behaviors that Handlebars does not implement.
-- Handlebars deviates from Mustache slightly in that it does not perform recursive lookup by default. The compile time `compat` flag must be set to enable this functionality. Users should note that there is a performance cost for enabling this flag. The exact cost varies by template, but it's recommended that performance sensitive operations should avoid this mode and instead opt for explicit path references.
-- The optional Mustache-style lambdas are not supported. Instead Handlebars provides it's own lambda resolution that follows the behaviors of helpers.
-- Alternative delimeters are not supported.
-
-
-Precompiling Templates
-----------------------
-
-Handlebars allows templates to be precompiled and included as javascript
-code rather than the handlebars template allowing for faster startup time.
-
-### Installation
-The precompiler script may be installed via npm using the `npm install -g handlebars`
-command.
-
-### Usage
-
-<pre>
-Precompile handlebar templates.
-Usage: handlebars template...
-
-Options:
-  -a, --amd            Create an AMD format function (allows loading with RequireJS)          [boolean]
-  -f, --output         Output File                                                            [string]
-  -k, --known          Known helpers                                                          [string]
-  -o, --knownOnly      Known helpers only                                                     [boolean]
-  -m, --min            Minimize output                                                        [boolean]
-  -s, --simple         Output template function only.                                         [boolean]
-  -r, --root           Template root. Base value that will be stripped from template names.   [string]
-  -c, --commonjs       Exports CommonJS style, path to Handlebars module                      [string]
-  -h, --handlebarPath  Path to handlebar.js (only valid for amd-style)                        [string]
-  -n, --namespace      Template namespace                                                     [string]
-  -p, --partial        Compiling a partial template                                           [boolean]
-  -d, --data           Include data when compiling                                            [boolean]
-  -e, --extension      Template extension.                                                    [string]
-  -b, --bom            Removes the BOM (Byte Order Mark) from the beginning of the templates. [boolean]
-</pre>
-
-If using the precompiler's normal mode, the resulting templates will be
-stored to the `Handlebars.templates` object using the relative template
-name sans the extension. These templates may be executed in the same
-manner as templates.
-
-If using the simple mode the precompiler will generate a single
-javascript method. To execute this method it must be passed to
-the `Handlebars.template` method and the resulting object may be used as normal.
-
-### Optimizations
-
-- Rather than using the full _handlebars.js_ library, implementations that
-  do not need to compile templates at runtime may include _handlebars.runtime.js_
-  whose min+gzip size is approximately 1k.
-- If a helper is known to exist in the target environment they may be defined
-  using the `--known name` argument may be used to optimize accesses to these
-  helpers for size and speed.
-- When all helpers are known in advance the `--knownOnly` argument may be used
-  to optimize all block helper references.
-- Implementations that do not use `@data` variables can improve performance of
-  iteration centric templates by specifying `{data: false}` in the compiler options.
-
-Supported Environments
-----------------------
-
-Handlebars has been designed to work in any ECMAScript 3 environment. This includes
-
-- Node.js
-- Chrome
-- Firefox
-- Safari 5+
-- Opera 11+
-- IE 6+
-
-Older versions and other runtimes are likely to work but have not been formally
-tested. The compiler requires `JSON.stringify` to be implemented natively or via a polyfill. If using the precompiler this is not necessary.
-
-[![Selenium Test Status](https://saucelabs.com/browser-matrix/handlebars.svg)](https://saucelabs.com/u/handlebars)
-
-Performance
------------
-
-In a rough performance test, precompiled Handlebars.js templates (in
-the original version of Handlebars.js) rendered in about half the
-time of Mustache templates. It would be a shame if it were any other
-way, since they were precompiled, but the difference in architecture
-does have some big performance advantages. Justin Marney, a.k.a.
-[gotascii](http://github.com/gotascii), confirmed that with an
-[independent test](http://sorescode.com/2010/09/12/benchmarks.html). The
-rewritten Handlebars (current version) is faster than the old version,
-with many [performance tests](https://travis-ci.org/wycats/handlebars.js/builds/33392182#L538) being 5 to 7 times faster than the Mustache equivalent.
-
-
-Upgrading
----------
-
-See [release-notes.md](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) for upgrade notes.
-
-Known Issues
-------------
-
-See [FAQ.md](https://github.com/wycats/handlebars.js/blob/master/FAQ.md) for known issues and common pitfalls.
-
-
-Handlebars in the Wild
-----------------------
-
-* [Assemble](http://assemble.io), by [@jonschlinkert](https://github.com/jonschlinkert)
-  and [@doowb](https://github.com/doowb), is a static site generator that uses Handlebars.js
-  as its template engine.
-* [CoSchedule](http://coschedule.com) An editorial calendar for WordPress that uses Handlebars.js
-* [dashbars](https://github.com/pismute/dashbars) A modern helper library for Handlebars.js.
-* [Ember.js](http://www.emberjs.com) makes Handlebars.js the primary way to
-  structure your views, also with automatic data binding support.
-* [Ghost](https://ghost.org/) Just a blogging platform.
-* [handlebars_assets](http://github.com/leshill/handlebars_assets): A Rails Asset Pipeline gem
-  from Les Hill (@leshill).
-* [handlebars-helpers](https://github.com/assemble/handlebars-helpers) is an extensive library
-  with 100+ handlebars helpers.
-* [handlebars-layouts](https://github.com/shannonmoeller/handlebars-layouts) is a set of helpers which implement extendible and embeddable layout blocks as seen in other popular templating languages.
-* [hbs](http://github.com/donpark/hbs): An Express.js view engine adapter for Handlebars.js,
-  from Don Park.
-* [koa-hbs](https://github.com/jwilm/koa-hbs): [koa](https://github.com/koajs/koa) generator based
-  renderer for Handlebars.js.
-* [jblotus](http://github.com/jblotus) created [http://tryhandlebarsjs.com](http://tryhandlebarsjs.com)
-  for anyone who would like to try out Handlebars.js in their browser.
-* [jQuery plugin](http://71104.github.io/jquery-handlebars/): allows you to use
-  Handlebars.js with [jQuery](http://jquery.com/).
-* [Lumbar](http://walmartlabs.github.io/lumbar) provides easy module-based template management for
-  handlebars projects.
-* [sammy.js](http://github.com/quirkey/sammy) by Aaron Quint, a.k.a. quirkey,
-  supports Handlebars.js as one of its template plugins.
-* [SproutCore](http://www.sproutcore.com) uses Handlebars.js as its main
-  templating engine, extending it with automatic data binding support.
-* [YUI](http://yuilibrary.com/yui/docs/handlebars/) implements a port of handlebars
-* [Swag](https://github.com/elving/swag) by [@elving](https://github.com/elving) is a growing collection of helpers for handlebars.js. Give your handlebars.js templates some swag son!
-* [DOMBars](https://github.com/blakeembrey/dombars) is a DOM-based templating engine built on the Handlebars parser and runtime
-
-External Resources
-------------------
-
-* [Gist about Synchronous and asynchronous loading of external handlebars templates](https://gist.github.com/2287070)
-
-Have a project using Handlebars? Send us a [pull request][pull-request]!
-
-License
--------
-Handlebars.js is released under the MIT license.
-
-[bower-repo]: https://github.com/components/handlebars.js
-[builds-page]: http://builds.handlebarsjs.com.s3.amazonaws.com/bucket-listing.html?sort=lastmod&sortdir=desc
-[pull-request]: https://github.com/wycats/handlebars.js/pull/new/master
diff --git a/lib/handlebars/bench/dist-size.js b/lib/handlebars/bench/dist-size.js
deleted file mode 100644
index 9e5fdc0f5..000000000
--- a/lib/handlebars/bench/dist-size.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var _ = require('underscore'),
-    async = require('async'),
-    fs = require('fs'),
-    zlib = require('zlib');
-
-module.exports = function(grunt, callback) {
-  var distFiles = fs.readdirSync('dist'),
-      distSizes = {};
-
-  async.each(distFiles, function(file, callback) {
-      var content;
-      try {
-        content = fs.readFileSync('dist/' + file);
-      } catch (err) {
-        if (err.code === 'EISDIR') {
-          callback();
-          return;
-        } else {
-          throw err;
-        }
-      }
-
-      file = file.replace(/\.js/, '').replace(/\./g, '_');
-      distSizes[file] = content.length;
-
-      zlib.gzip(content, function(err, data) {
-        if (err) {
-          throw err;
-        }
-
-        distSizes[file + '_gz'] = data.length;
-        callback();
-      });
-    },
-    function() {
-      grunt.log.writeln('Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2));
-      callback([distSizes]);
-    });
-};
diff --git a/lib/handlebars/bench/index.js b/lib/handlebars/bench/index.js
deleted file mode 100644
index 462b046f5..000000000
--- a/lib/handlebars/bench/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var fs = require('fs');
-
-var metrics = fs.readdirSync(__dirname);
-metrics.forEach(function(metric) {
-  if (metric === 'index.js' || !/(.*)\.js$/.test(metric)) {
-    return;
-  }
-
-  var name = RegExp.$1;
-  metric = require('./' + name);
-  if (metric instanceof Function) {
-    module.exports[name] = metric;
-  }
-});
diff --git a/lib/handlebars/bench/precompile-size.js b/lib/handlebars/bench/precompile-size.js
deleted file mode 100644
index 66eacd025..000000000
--- a/lib/handlebars/bench/precompile-size.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var _ = require('underscore'),
-    templates = require('./templates');
-
-module.exports = function(grunt, callback) {
-  // Deferring to here in case we have a build for parser, etc as part of this grunt exec
-  var Handlebars = require('../lib');
-
-  var templateSizes = {};
-  _.each(templates, function(info, template) {
-    var src = info.handlebars,
-        compiled = Handlebars.precompile(src, {}),
-        knownHelpers = Handlebars.precompile(src, {knownHelpersOnly: true, knownHelpers: info.helpers});
-
-    templateSizes[template] = compiled.length;
-    templateSizes['knownOnly_' + template] = knownHelpers.length;
-  });
-  grunt.log.writeln('Precompiled sizes: ' + JSON.stringify(templateSizes, undefined, 2));
-  callback([templateSizes]);
-};
diff --git a/lib/handlebars/bench/templates/arguments.js b/lib/handlebars/bench/templates/arguments.js
deleted file mode 100644
index 5480c8d8e..000000000
--- a/lib/handlebars/bench/templates/arguments.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-  helpers: {
-    foo: function(options) {
-      return '';
-    }
-  },
-  context: {
-    bar: true
-  },
-
-  handlebars: '{{foo person "person" 1 true foo=bar foo="person" foo=1 foo=true}}'
-};
diff --git a/lib/handlebars/bench/templates/array-each.js b/lib/handlebars/bench/templates/array-each.js
deleted file mode 100644
index f1eb1e8e9..000000000
--- a/lib/handlebars/bench/templates/array-each.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] },
-  handlebars: "{{#each names}}{{name}}{{/each}}",
-  dust: "{#names}{name}{/names}",
-  mustache: "{{#names}}{{name}}{{/names}}",
-  eco: "<% for item in @names: %><%= item.name %><% end %>"
-};
diff --git a/lib/handlebars/bench/templates/array-mustache.js b/lib/handlebars/bench/templates/array-mustache.js
deleted file mode 100644
index 908f805ea..000000000
--- a/lib/handlebars/bench/templates/array-mustache.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] },
-  handlebars: "{{#names}}{{name}}{{/names}}"
-}
diff --git a/lib/handlebars/bench/templates/complex.dust b/lib/handlebars/bench/templates/complex.dust
deleted file mode 100644
index ff453c2b8..000000000
--- a/lib/handlebars/bench/templates/complex.dust
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>{header}</h1>
-{?items}
-  <ul>
-    {#items}
-      {#current}
-        <li><strong>{name}</strong></li>
-      {:else}
-        <li><a href="{url}">{name}</a></li>
-      {/current}
-    {/items}
-  </ul>
-{:else}
-  <p>The list is empty.</p>
-{/items}
diff --git a/lib/handlebars/bench/templates/complex.eco b/lib/handlebars/bench/templates/complex.eco
deleted file mode 100644
index 42fb55b48..000000000
--- a/lib/handlebars/bench/templates/complex.eco
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1><%= @header() %></h1>
-<% if @items.length: %>
-  <ul>
-    <% for item in @items: %>
-      <% if item.current: %>
-        <li><strong><%= item.name %></strong></li>
-      <% else: %>
-        <li><a href="<%= item.url %>"><%= item.name %></a></li>
-      <% end %>
-    <% end %>
-  </ul>
-<% else: %>
-  <p>The list is empty.</p>
-<% end %>
diff --git a/lib/handlebars/bench/templates/complex.handlebars b/lib/handlebars/bench/templates/complex.handlebars
deleted file mode 100644
index 4a5953445..000000000
--- a/lib/handlebars/bench/templates/complex.handlebars
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>{{header}}</h1>
-{{#if items}}
-  <ul>
-    {{#each items}}
-      {{#if current}}
-        <li><strong>{{name}}</strong></li>
-      {{^}}
-        <li><a href="{{url}}">{{name}}</a></li>
-      {{/if}}
-    {{/each}}
-  </ul>
-{{^}}
-  <p>The list is empty.</p>
-{{/if}}
diff --git a/lib/handlebars/bench/templates/complex.js b/lib/handlebars/bench/templates/complex.js
deleted file mode 100644
index ddf361b59..000000000
--- a/lib/handlebars/bench/templates/complex.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var fs = require('fs');
-
-module.exports = {
-  context: {
-    header: function() {
-      return "Colors";
-    },
-    hasItems: true,   // To make things fairer in mustache land due to no `{{if}}` construct on arrays
-    items: [
-      {name: "red", current: true, url: "#Red"},
-      {name: "green", current: false, url: "#Green"},
-      {name: "blue", current: false, url: "#Blue"}
-    ]
-  },
-
-  handlebars: fs.readFileSync(__dirname + '/complex.handlebars').toString(),
-  dust: fs.readFileSync(__dirname + '/complex.dust').toString(),
-  eco: fs.readFileSync(__dirname + '/complex.eco').toString(),
-  mustache: fs.readFileSync(__dirname + '/complex.mustache').toString()
-};
diff --git a/lib/handlebars/bench/templates/complex.mustache b/lib/handlebars/bench/templates/complex.mustache
deleted file mode 100644
index 9e425872f..000000000
--- a/lib/handlebars/bench/templates/complex.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>{{header}}</h1>
-{{#hasItems}}
-  <ul>
-    {{#items}}
-      {{#current}}
-        <li><strong>{{name}}</strong></li>
-      {{/current}}
-      {{^current}}
-        <li><a href="{{url}}">{{name}}</a></li>
-      {{/current}}
-    {{/items}}
-  </ul>
-{{/hasItems}}
diff --git a/lib/handlebars/bench/templates/data.js b/lib/handlebars/bench/templates/data.js
deleted file mode 100644
index f532decd5..000000000
--- a/lib/handlebars/bench/templates/data.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] },
-  handlebars: "{{#each names}}{{@index}}{{name}}{{/each}}"
-}
diff --git a/lib/handlebars/bench/templates/depth-1.js b/lib/handlebars/bench/templates/depth-1.js
deleted file mode 100644
index 74809bca8..000000000
--- a/lib/handlebars/bench/templates/depth-1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}], foo: 'bar' },
-  handlebars: "{{#each names}}{{../foo}}{{/each}}",
-  mustache: "{{#names}}{{foo}}{{/names}}",
-  eco: "<% for item in @names: %><%= @foo %><% end %>"
-};
diff --git a/lib/handlebars/bench/templates/depth-2.js b/lib/handlebars/bench/templates/depth-2.js
deleted file mode 100644
index 1d38baa4e..000000000
--- a/lib/handlebars/bench/templates/depth-2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  context: { names: [{bat: 'foo', name: ["Moe"]}, {bat: 'foo', name: ["Larry"]}, {bat: 'foo', name: ["Curly"]}, {bat: 'foo', name: ["Shemp"]}], foo: 'bar' },
-  handlebars: "{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}",
-  mustache: "{{#names}}{{#name}}{{bat}}{{foo}}{{/name}}{{/names}}",
-  eco: "<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>"
-};
diff --git a/lib/handlebars/bench/templates/index.js b/lib/handlebars/bench/templates/index.js
deleted file mode 100644
index a718ea388..000000000
--- a/lib/handlebars/bench/templates/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var fs = require('fs');
-
-var templates = fs.readdirSync(__dirname);
-templates.forEach(function(template) {
-  if (template === 'index.js' || !/(.*)\.js$/.test(template)) {
-    return;
-  }
-  module.exports[RegExp.$1] = require('./' + RegExp.$1);
-});
diff --git a/lib/handlebars/bench/templates/object-mustache.js b/lib/handlebars/bench/templates/object-mustache.js
deleted file mode 100644
index 52dbc26e3..000000000
--- a/lib/handlebars/bench/templates/object-mustache.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  context: { person: { name: "Larry", age: 45 } },
-  handlebars: "{{#person}}{{name}}{{age}}{{/person}}"
-};
diff --git a/lib/handlebars/bench/templates/object.js b/lib/handlebars/bench/templates/object.js
deleted file mode 100644
index fef127ada..000000000
--- a/lib/handlebars/bench/templates/object.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  context: { person: { name: "Larry", age: 45 } },
-  handlebars: "{{#with person}}{{name}}{{age}}{{/with}}",
-  dust: "{#person}{name}{age}{/person}",
-  eco: "<%= @person.name %><%= @person.age %>",
-  mustache: "{{#person}}{{name}}{{age}}{{/person}}"
-};
diff --git a/lib/handlebars/bench/templates/partial-recursion.js b/lib/handlebars/bench/templates/partial-recursion.js
deleted file mode 100644
index 9d604fd02..000000000
--- a/lib/handlebars/bench/templates/partial-recursion.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-  context: { name: '1', kids: [{ name: '1.1', kids: [{name: '1.1.1', kids: []}] }] },
-  partials: {
-    mustache: { recursion: "{{name}}{{#kids}}{{>recursion}}{{/kids}}" },
-    handlebars: { recursion: "{{name}}{{#each kids}}{{>recursion}}{{/each}}" }
-  },
-  handlebars: "{{name}}{{#each kids}}{{>recursion}}{{/each}}",
-  dust: "{name}{#kids}{>recursion:./}{/kids}",
-  mustache: "{{name}}{{#kids}}{{>recursion}}{{/kids}}"
-};
diff --git a/lib/handlebars/bench/templates/partial.js b/lib/handlebars/bench/templates/partial.js
deleted file mode 100644
index a6e663156..000000000
--- a/lib/handlebars/bench/templates/partial.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-  context: { peeps: [{name: "Moe", count: 15}, {name: "Larry", count: 5}, {name: "Curly", count: 1}] },
-  partials: {
-    mustache: { variables: "Hello {{name}}! You have {{count}} new messages." },
-    handlebars: { variables: "Hello {{name}}! You have {{count}} new messages." }
-  },
-
-  handlebars: "{{#each peeps}}{{>variables}}{{/each}}",
-  dust: "{#peeps}{>variables/}{/peeps}",
-  mustache: "{{#peeps}}{{>variables}}{{/peeps}}"
-};
diff --git a/lib/handlebars/bench/templates/paths.js b/lib/handlebars/bench/templates/paths.js
deleted file mode 100644
index d84e06152..000000000
--- a/lib/handlebars/bench/templates/paths.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  context: { person: { name: {bar: {baz: "Larry"}}, age: 45 } },
-  handlebars: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}",
-  dust: "{person.name.bar.baz}{person.age}{person.foo}{animal.age}",
-  eco: "<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>",
-  mustache: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}"
-};
diff --git a/lib/handlebars/bench/templates/string.js b/lib/handlebars/bench/templates/string.js
deleted file mode 100644
index 335e37cf9..000000000
--- a/lib/handlebars/bench/templates/string.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  context: {},
-  handlebars: "Hello world",
-  dust: "Hello world",
-  mustache: "Hello world",
-  eco: "Hello world"
-};
diff --git a/lib/handlebars/bench/templates/subexpression.js b/lib/handlebars/bench/templates/subexpression.js
deleted file mode 100644
index 261c22d01..000000000
--- a/lib/handlebars/bench/templates/subexpression.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
-  helpers: {
-    echo: function(value) {
-      return 'foo ' + value;
-    },
-    header: function() {
-      return "Colors";
-    }
-  },
-  handlebars: "{{echo (header)}}",
-  eco: "<%= @echo(@header()) %>"
-};
-
-module.exports.context = module.exports.helpers;
diff --git a/lib/handlebars/bench/templates/variables.js b/lib/handlebars/bench/templates/variables.js
deleted file mode 100644
index d354238b1..000000000
--- a/lib/handlebars/bench/templates/variables.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
-  context: {name: "Mick", count: 30},
-  handlebars:  "Hello {{name}}! You have {{count}} new messages.",
-  dust: "Hello {name}! You have {count} new messages.",
-  mustache: "Hello {{name}}! You have {{count}} new messages.",
-  eco: "Hello <%= @name %>! You have <%= @count %> new messages."
-};
-
diff --git a/lib/handlebars/bench/throughput.js b/lib/handlebars/bench/throughput.js
deleted file mode 100644
index d27a94d31..000000000
--- a/lib/handlebars/bench/throughput.js
+++ /dev/null
@@ -1,131 +0,0 @@
-var _ = require('underscore'),
-    runner = require('./util/template-runner'),
-    templates = require('./templates'),
-
-    eco, dust, Handlebars, Mustache, eco;
-
-try {
-  dust = require("dustjs-linkedin");
-} catch (err) { /* NOP */ }
-
-try {
-  Mustache = require("mustache");
-} catch (err) { /* NOP */ }
-
-try {
-  eco = require("eco");
-} catch (err) { /* NOP */ }
-
-function error() {
-  throw new Error("EWOT");
-}
-
-function makeSuite(bench, name, template, handlebarsOnly) {
-  // Create aliases to minimize any impact from having to walk up the closure tree.
-  var templateName = name,
-
-      context = template.context,
-      partials = template.partials,
-
-      handlebarsOut,
-      compatOut,
-      dustOut,
-      ecoOut,
-      mustacheOut;
-
-  var handlebar = Handlebars.compile(template.handlebars, {data: false}),
-      compat =  Handlebars.compile(template.handlebars, {data: false, compat: true}),
-      options = {helpers: template.helpers};
-  _.each(template.partials && template.partials.handlebars, function(partial, name) {
-    Handlebars.registerPartial(name, Handlebars.compile(partial, {data: false}));
-  });
-
-  handlebarsOut = handlebar(context, options);
-  bench("handlebars", function() {
-    handlebar(context, options);
-  });
-
-  compatOut = compat(context, options);
-  bench("compat", function() {
-    compat(context, options);
-  });
-
-  if (handlebarsOnly) {
-    return;
-  }
-
-  if (dust) {
-    if (template.dust) {
-      dustOut = false;
-      dust.loadSource(dust.compile(template.dust, templateName));
-
-      dust.render(templateName, context, function(err, out) { dustOut = out; });
-
-      bench("dust", function() {
-        dust.render(templateName, context, function(err, out) { });
-      });
-    } else {
-      bench('dust', error);
-    }
-  }
-
-  if (eco) {
-    if (template.eco) {
-      var ecoTemplate = eco.compile(template.eco);
-
-      ecoOut = ecoTemplate(context);
-
-      bench("eco", function() {
-        ecoTemplate(context);
-      });
-    } else {
-      bench("eco", error);
-    }
-  }
-
-  if (Mustache) {
-    var mustacheSource = template.mustache,
-        mustachePartials = partials && partials.mustache;
-
-    if (mustacheSource) {
-      mustacheOut = Mustache.to_html(mustacheSource, context, mustachePartials);
-
-      bench("mustache", function() {
-        Mustache.to_html(mustacheSource, context, mustachePartials);
-      });
-    } else {
-      bench("mustache", error);
-    }
-  }
-
-  // Hack around whitespace until we have whitespace control
-  handlebarsOut = handlebarsOut.replace(/\s/g, '');
-  function compare(b, lang) {
-    if (b == null) {
-      return;
-    }
-
-    b = b.replace(/\s/g, '');
-
-    if (handlebarsOut !== b) {
-      throw new Error('Template output mismatch: ' + name
-            + '\n\nHandlebars: ' + handlebarsOut
-            + '\n\n' + lang + ': ' + b);
-    }
-  }
-
-  compare(compatOut, 'compat');
-  compare(dustOut, 'dust');
-  compare(ecoOut, 'eco');
-  compare(mustacheOut, 'mustache');
-}
-
-module.exports = function(grunt, callback) {
-  // Deferring load incase we are being run inline with the grunt build
-  Handlebars = require('../lib');
-
-  console.log('Execution Throughput');
-  runner(grunt, makeSuite, function(times, scaled) {
-    callback(scaled);
-  });
-};
diff --git a/lib/handlebars/bench/util/benchwarmer.js b/lib/handlebars/bench/util/benchwarmer.js
deleted file mode 100644
index 7496a3e9e..000000000
--- a/lib/handlebars/bench/util/benchwarmer.js
+++ /dev/null
@@ -1,199 +0,0 @@
-var _ = require('underscore'),
-    Benchmark = require("benchmark");
-
-var BenchWarmer = function(names) {
-  this.benchmarks = [];
-  this.currentBenches = [];
-  this.names = [];
-  this.times = {};
-  this.minimum = Infinity;
-  this.maximum = -Infinity;
-  this.errors = {};
-};
-
-var print = require("sys").print;
-
-BenchWarmer.prototype = {
-  winners: function(benches) {
-    return Benchmark.filter(benches, 'fastest');
-  },
-  suite: function(suite, fn) {
-    this.suiteName = suite;
-    this.times[suite] = {};
-    this.first = true;
-
-    var self = this;
-
-    fn(function(name, benchFn) {
-      self.push(name, benchFn);
-    });
-  },
-  push: function(name, fn) {
-    if(this.names.indexOf(name) == -1) {
-      this.names.push(name);
-    }
-
-    var first = this.first, suiteName = this.suiteName, self = this;
-    this.first = false;
-
-    var bench = new Benchmark(fn, {
-      name: this.suiteName + ": " + name,
-      onComplete: function() {
-        if(first) { self.startLine(suiteName); }
-        self.writeBench(bench);
-        self.currentBenches.push(bench);
-      }, onError: function() {
-        self.errors[this.name] = this;
-      }
-    });
-    bench.suiteName = this.suiteName;
-    bench.benchName = name;
-
-    this.benchmarks.push(bench);
-  },
-
-  bench: function(callback) {
-    var self = this;
-
-    this.printHeader('ops/msec', true);
-
-    Benchmark.invoke(this.benchmarks, {
-      name: "run",
-      onComplete: function() {
-        self.scaleTimes();
-
-        self.startLine('');
-
-        print('\n');
-        self.printHeader('scaled');
-        _.each(self.scaled, function(value, name) {
-          self.startLine(name);
-
-          _.each(self.names, function(lang) {
-            self.writeValue(value[lang] || '');
-          });
-        });
-        print('\n');
-
-        var errors = false, prop, bench;
-        for(prop in self.errors) {
-          if (self.errors.hasOwnProperty(prop)
-              && self.errors[prop].error.message !== 'EWOT') {
-            errors = true;
-            break;
-          }
-        }
-
-        if(errors) {
-          print("\n\nErrors:\n");
-          for(prop in self.errors) {
-            if (self.errors.hasOwnProperty(prop)
-                && self.errors[prop].error.message !== 'EWOT') {
-              bench = self.errors[prop];
-              print("\n" + bench.name + ":\n");
-              print(bench.error.message);
-              if(bench.error.stack) {
-                print(bench.error.stack.join("\n"));
-              }
-              print("\n");
-            }
-          }
-        }
-
-        callback();
-      }
-    });
-
-    print("\n");
-  },
-
-  scaleTimes: function() {
-    var scaled = this.scaled = {};
-    _.each(this.times, function(times, name) {
-      var output = scaled[name] = {};
-
-      _.each(times, function(time, lang) {
-        output[lang] = ((time - this.minimum) / (this.maximum - this.minimum) * 100).toFixed(2);
-      }, this);
-    }, this);
-  },
-
-  printHeader: function(title, winners) {
-    var benchSize = 0, names = this.names, i, l;
-
-    for(i=0, l=names.length; i<l; i++) {
-      var name = names[i];
-
-      if(benchSize < name.length) { benchSize = name.length; }
-    }
-
-    this.nameSize = benchSize + 2;
-    this.benchSize = 20;
-    var horSize = 0;
-
-    this.startLine(title);
-    horSize = horSize + this.benchSize;
-    for(i=0, l=names.length; i<l; i++) {
-      this.writeValue(names[i]);
-      horSize = horSize + this.benchSize;
-    }
-
-    if (winners) {
-      print("WINNER(S)");
-      horSize = horSize + "WINNER(S)".length;
-    }
-
-    print("\n" + new Array(horSize + 1).join("-"));
-  },
-
-  startLine: function(name) {
-    var winners = Benchmark.map(this.winners(this.currentBenches), function(bench) {
-      return bench.name.split(": ")[1];
-    });
-
-    this.currentBenches = [];
-
-    print(winners.join(", "));
-    print("\n");
-
-    if (name) {
-      this.writeValue(name);
-    }
-  },
-  writeBench: function(bench) {
-    var out;
-
-    if(!bench.error) {
-      var count = bench.hz,
-          moe   = count * bench.stats.rme / 100,
-          minimum,
-          maximum;
-
-      count = Math.round(count / 1000);
-      moe = Math.round(moe / 1000);
-      minimum = count - moe;
-      maximum = count + moe;
-
-      out = count + " ±" + moe + " (" + bench.cycles + ")";
-
-      this.times[bench.suiteName][bench.benchName] = count;
-      this.minimum = Math.min(this.minimum, minimum);
-      this.maximum = Math.max(this.maximum, maximum);
-    } else {
-      if (bench.error.message === 'EWOT') {
-        out = 'NA';
-      } else {
-        out = 'E';
-      }
-    }
-    this.writeValue(out);
-  },
-
-  writeValue: function(out) {
-    var padding = this.benchSize - out.length + 1;
-    out = out + new Array(padding).join(" ");
-    print(out);
-  }
-};
-
-module.exports = BenchWarmer;
diff --git a/lib/handlebars/bench/util/template-runner.js b/lib/handlebars/bench/util/template-runner.js
deleted file mode 100644
index 8863ccd6f..000000000
--- a/lib/handlebars/bench/util/template-runner.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var _ = require('underscore'),
-    BenchWarmer = require('./benchwarmer'),
-    templates = require('../templates');
-
-module.exports = function(grunt, makeSuite, callback) {
-  var warmer = new BenchWarmer();
-
-  var handlebarsOnly = grunt.option('handlebars-only'),
-      grep = grunt.option('grep');
-  if (grep) {
-    grep = new RegExp(grep);
-  }
-
-  _.each(templates, function(template, name) {
-    if (!template.handlebars || (grep && !grep.test(name))) {
-      return;
-    }
-
-    warmer.suite(name, function(bench) {
-      makeSuite(bench, name, template, handlebarsOnly);
-    });
-  });
-
-  warmer.bench(function() {
-    callback && callback(warmer.times, warmer.scaled);
-  });
-};
diff --git a/lib/handlebars/bin/handlebars b/lib/handlebars/bin/handlebars
deleted file mode 100755
index 4ed98b372..000000000
--- a/lib/handlebars/bin/handlebars
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env node
-
-var optimist = require('optimist')
-    .usage('Precompile handlebar templates.\nUsage: $0 [template|directory]...', {
-      'f': {
-        'type': 'string',
-        'description': 'Output File',
-        'alias': 'output'
-      },
-      'map': {
-        'type': 'string',
-        'description': 'Source Map File'
-      },
-      'a': {
-        'type': 'boolean',
-        'description': 'Exports amd style (require.js)',
-        'alias': 'amd'
-      },
-      'c': {
-        'type': 'string',
-        'description': 'Exports CommonJS style, path to Handlebars module',
-        'alias': 'commonjs',
-        'default': null
-      },
-      'h': {
-        'type': 'string',
-        'description': 'Path to handlebar.js (only valid for amd-style)',
-        'alias': 'handlebarPath',
-  	    'default': ''
-      },
-      'k': {
-        'type': 'string',
-        'description': 'Known helpers',
-        'alias': 'known'
-      },
-      'o': {
-        'type': 'boolean',
-        'description': 'Known helpers only',
-        'alias': 'knownOnly'
-      },
-      'm': {
-        'type': 'boolean',
-        'description': 'Minimize output',
-        'alias': 'min'
-      },
-      'n': {
-        'type': 'string',
-        'description': 'Template namespace',
-        'alias': 'namespace',
-        'default': 'Handlebars.templates'
-      },
-      's': {
-        'type': 'boolean',
-        'description': 'Output template function only.',
-        'alias': 'simple'
-      },
-      'r': {
-        'type': 'string',
-        'description': 'Template root. Base value that will be stripped from template names.',
-        'alias': 'root'
-      },
-      'p' : {
-        'type': 'boolean',
-        'description': 'Compiling a partial template',
-        'alias': 'partial'
-      },
-      'd' : {
-        'type': 'boolean',
-        'description': 'Include data when compiling',
-        'alias': 'data'
-      },
-      'e': {
-        'type': 'string',
-        'description': 'Template extension.',
-        'alias': 'extension',
-        'default': 'handlebars'
-      },
-      'b': {
-        'type': 'boolean',
-        'description': 'Removes the BOM (Byte Order Mark) from the beginning of the templates.',
-        'alias': 'bom'
-      },
-      'v': {
-        'type': 'boolean',
-        'description': 'Prints the current compiler version',
-        'alias': 'version'
-      },
-
-      'help': {
-        'type': 'boolean',
-        'description': 'Outputs this message'
-      }
-    })
-
-    .check(function(argv) {
-      if (argv.version) {
-        return;
-      }
-    });
-
-
-var argv = optimist.argv;
-argv.templates = argv._;
-delete argv._;
-
-if (argv.help || (!argv.templates.length && !argv.version)) {
-  optimist.showHelp();
-  return;
-}
-
-return require('../dist/cjs/precompiler').cli(argv);
diff --git a/lib/handlebars/components/bower.json b/lib/handlebars/components/bower.json
deleted file mode 100644
index fe064c285..000000000
--- a/lib/handlebars/components/bower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "handlebars",
-  "version": "3.0.3",
-  "main": "handlebars.js",
-  "dependencies": {}
-}
diff --git a/lib/handlebars/components/component.json b/lib/handlebars/components/component.json
deleted file mode 100644
index f74c83962..000000000
--- a/lib/handlebars/components/component.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "handlebars",
-  "repo": "components/handlebars.js",
-  "version": "1.0.0",
-  "main": "handlebars.js",
-  "scripts": [
-    "handlebars.js"
-  ]
-}
diff --git a/lib/handlebars/components/composer.json b/lib/handlebars/components/composer.json
deleted file mode 100644
index c5dc4271f..000000000
--- a/lib/handlebars/components/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "components/handlebars.js",
-    "description": "Handlebars.js and Mustache are both logicless templating languages that keep the view and the code separated like we all know they should be.",
-    "homepage": "http://handlebarsjs.com",
-    "license": "MIT",
-    "type": "component",
-    "keywords": [
-        "handlebars",
-        "mustache",
-        "html"
-    ],
-    "authors": [
-        {
-            "name": "Chris Wanstrath",
-            "homepage": "http://chriswanstrath.com"
-        }
-    ],
-    "require": {
-        "robloach/component-installer": "*"
-    },
-    "extra": {
-        "component": {
-            "name": "handlebars",
-            "scripts": [
-                "handlebars.js"
-            ],
-            "files": [
-                "handlebars.runtime.js"
-            ],
-            "shim": {
-                "exports": "Handlebars"
-            }
-        }
-    }
-}
diff --git a/lib/handlebars/components/handlebars-source.gemspec b/lib/handlebars/components/handlebars-source.gemspec
deleted file mode 100644
index 7b5d59566..000000000
--- a/lib/handlebars/components/handlebars-source.gemspec
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'json'
-
-package = JSON.parse(File.read('bower.json'))
-
-Gem::Specification.new do |gem|
-  gem.name          = "handlebars-source"
-  gem.authors       = ["Yehuda Katz"]
-  gem.email         = ["wycats@gmail.com"]
-  gem.date          = Time.now.strftime("%Y-%m-%d")
-  gem.description   = %q{Handlebars.js source code wrapper for (pre)compilation gems.}
-  gem.summary       = %q{Handlebars.js source code wrapper}
-  gem.homepage      = "https://github.com/wycats/handlebars.js/"
-  gem.version       = package["version"].sub "-", "."
-  gem.license       = "MIT"
-
-  gem.files = [
-    'handlebars.js',
-    'handlebars.runtime.js',
-    'lib/handlebars/source.rb'
-  ]
-end
diff --git a/lib/handlebars/components/handlebars.js.nuspec b/lib/handlebars/components/handlebars.js.nuspec
deleted file mode 100644
index ae298147a..000000000
--- a/lib/handlebars/components/handlebars.js.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-	<metadata>
-		<id>handlebars.js</id>
-		<version>3.0.3</version>
-		<authors>handlebars.js Authors</authors>
-		<licenseUrl>https://github.com/wycats/handlebars.js/blob/master/LICENSE</licenseUrl>
-		<projectUrl>https://github.com/wycats/handlebars.js/</projectUrl>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Extension of the Mustache logicless template language</description>
-		<releaseNotes></releaseNotes>
-		<tags>handlebars mustache template html</tags>
-	</metadata>
-	<files>
-		<file src="handlebars.js" target="Content\Scripts" />
-	</files>
-</package>
diff --git a/lib/handlebars/components/lib/handlebars/source.rb b/lib/handlebars/components/lib/handlebars/source.rb
deleted file mode 100644
index 4f3f8bfce..000000000
--- a/lib/handlebars/components/lib/handlebars/source.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Handlebars
-  module Source
-    def self.bundled_path
-      File.expand_path("../../../handlebars.js", __FILE__)
-    end
-
-    def self.runtime_bundled_path
-      File.expand_path("../../../handlebars.runtime.js", __FILE__)
-    end
-  end
-end
diff --git a/lib/handlebars/docs/compiler-api.md b/lib/handlebars/docs/compiler-api.md
deleted file mode 100644
index c09414f0b..000000000
--- a/lib/handlebars/docs/compiler-api.md
+++ /dev/null
@@ -1,276 +0,0 @@
-# Handlebars Compiler APIs
-
-There are a number of formal APIs that tool implementors may interact with.
-
-## AST
-
-Other tools may interact with the formal AST as defined below. Any JSON structure matching this pattern may be used and passed into the `compile` and `precompile` methods in the same way as the text for a template.
-
-AST structures may be generated either with the `Handlebars.parse` method and then manipulated, via the `Handlebars.AST` objects of the same name, or constructed manually as a generic JavaScript object matching the structure defined below.
-
-```javascript
-var ast = Handlebars.parse(myTemplate);
-
-// Modify ast
-
-Handlebars.precompile(ast);
-```
-
-
-### Basic
-
-```java
-interface Node {
-    type: string;
-    loc: SourceLocation | null;
-}
-
-interface SourceLocation {
-    source: string | null;
-    start: Position;
-    end: Position;
-}
-
-interface Position {
-    line: uint >= 1;
-    column: uint >= 0;
-}
-```
-
-### Programs
-
-```java
-interface Program <: Node {
-    type: "Program";
-    body: [ Statement ];
-    
-    blockParams: [ string ];
-}
-```
-
-### Statements
-
-```java
-interface Statement <: Node { }
-
-interface MustacheStatement <: Statement {
-    type: "MustacheStatement";
-
-    path: PathExpression | Literal;
-    params: [ Expression ];
-    hash: Hash;
-
-    escaped: boolean;
-    strip: StripFlags | null;
-}
-
-interface BlockStatement <: Statement {
-    type: "BlockStatement";
-    path: PathExpression;
-    params: [ Expression ];
-    hash: Hash;
-
-    program: Program | null;
-    inverse: Program | null;
-
-    openStrip: StripFlags | null;
-    inverseStrip: StripFlags | null;
-    closeStrip: StripFlags | null;
-}
-
-interface PartialStatement <: Statement {
-    type: "PartialStatement";
-    name: PathExpression | SubExpression;
-    params: [ Expression ];
-    hash: Hash;
-    
-    indent: string;
-    strip: StripFlags | null;
-}
-```
-
-`name` will be a `SubExpression` when tied to a dynamic partial, i.e. `{{> (foo) }}`, otherwise this is a path or literal whose `original` value is used to lookup the desired partial.
-
-
-```java
-interface ContentStatement <: Statement {
-    type: "ContentStatement";
-    value: string;
-    original: string;
-}
-
-interface CommentStatement <: Statement {
-    type: "CommentStatement";
-    value: string;
-
-    strip: StripFlags | null;
-}
-```
-
-### Expressions
-
-```java
-interface Expression <: Node { }
-```
-
-##### SubExpressions
-
-```java
-interface SubExpression <: Expression {
-    type: "SubExpression";
-    path: PathExpression;
-    params: [ Expression ];
-    hash: Hash;
-}
-```
-
-##### Paths
-
-```java
-interface PathExpression <: Expression {
-    type: "PathExpression";
-    data: boolean;
-    depth: uint >= 0;
-    parts: [ string ];
-    original: string;
-}
-```
-
-- `data` is true when the given expression is a `@data` reference.
-- `depth` is an integer representation of which context the expression references. `0` represents the current context, `1` would be `../`, etc.
-- `parts` is an array of the names in the path. `foo.bar` would be `['foo', 'bar']`. Scope references, `.`, `..`, and `this` should be omitted from this array.
-- `original` is the path as entered by the user. Separator and scope references are left untouched.
-
-
-##### Literals
-
-```java
-interface Literal <: Expression { }
-
-interface StringLiteral <: Literal {
-    type: "StringLiteral";
-    value: string;
-    original: string;
-}
-
-interface BooleanLiteral <: Literal {
-    type: "BooleanLiteral";
-    value: boolean;
-    original: boolean;
-}
-
-interface NumberLiteral <: Literal {
-    type: "NumberLiteral";
-    value: number;
-    original: number;
-}
-
-interface UndefinedLiteral <: Literal {
-    type: "UndefinedLiteral";
-}
-
-interface NullLiteral <: Literal {
-    type: "NullLiteral";
-}
-```
-
-
-### Miscellaneous
-
-```java
-interface Hash <: Node {
-    type: "Hash";
-    pairs: [ HashPair ];
-}
-
-interface HashPair <: Node {
-    type: "HashPair";
-    key: string;
-    value: Expression;
-}
-
-interface StripFlags {
-    open: boolean;
-    close: boolean;
-}
-```
-
-`StripFlags` are used to signify whitespace control character that may have been entered on a given statement.
-
-## AST Visitor
-
-`Handlebars.Visitor` is available as a base class for general interaction with AST structures. This will by default traverse the entire tree and individual methods may be overridden to provide specific responses to particular nodes.
-
-Recording all referenced partial names:
-
-```javascript
-var Visitor = Handlebars.Visitor;
-
-function ImportScanner() {
-  this.partials = [];
-}
-ImportScanner.prototype = new Visitor();
-
-ImportScanner.prototype.PartialStatement = function(partial) {
-  this.partials.push({request: partial.name.original});
-
-  Visitor.prototype.PartialStatement.call(this, partial);
-};
-
-var scanner = new ImportScanner();
-scanner.accept(ast);
-```
-
-The current node's ancestors will be maintained in the `parents` array, with the most recent parent listed first.
-
-The visitor may also be configured to operate in mutation mode by setting the `mutation` field to true. When in this mode, handler methods may return any valid AST node and it will replace the one they are currently operating on. Returning `false` will remove the given value (if valid) and returning `undefined` will leave the node in tact. This return structure only apply to mutation mode and non-mutation mode visitors are free to return whatever values they wish.
-
-Implementors that may need to support mutation mode are encouraged to utilize the `acceptKey`, `acceptRequired` and `acceptArray` helpers which provide the conditional overwrite behavior as well as implement sanity checks where pertinent.
-
-## JavaScript Compiler
-
-The `Handlebars.JavaScriptCompiler` object has a number of methods that may be customized to alter the output of the compiler:
-
-- `nameLookup(parent, name, type)`
-  Used to generate the code to resolve a give path component.
-
-  - `parent` is the existing code in the path resolution
-  - `name` is the current path component
-  - `type` is the type of name being evaluated. May be one of `context`, `data`, `helper`, or `partial`.
-
-  Note that this does not impact dynamic partials, which implementors need to be aware of. Overriding `VM.resolvePartial` may be required to support dynamic cases.
-
-- `depthedLookup(name)`
-  Used to generate code that resolves parameters within any context in the stack. Is only used in `compat` mode. 
-
-- `compilerInfo()`
-  Allows for custom compiler flags used in the runtime version checking logic.
-
-- `appendToBuffer(source, location, explicit)`
-    Allows for code buffer emitting code. Defaults behavior is string concatenation.
-
-    - `source` is the source code whose result is to be appending
-    - `location` is the location of the source in the source map.
-    - `explicit` is a flag signaling that the emit operation must occur, vs. the lazy evaled options otherwise.
-
-- `initializeBuffer()`
-    Allows for buffers other than the default string buffer to be used. Generally needs to be paired with a custom `appendToBuffer` implementation.
-
-```javascript
-function MyCompiler() {
-  Handlebars.JavaScriptCompiler.apply(this, arguments);
-}
-MyCompiler.prototype = Object.create(Handlebars.JavaScriptCompiler);
-
-MyCompiler.nameLookup = function(parent, name, type) {
-  if (type === 'partial') {
-    return 'MyPartialList[' + JSON.stringify(name) ']';
-  } else {
-    return Handlebars.JavaScriptCompiler.prototype.nameLookup.call(this, parent, name, type);
-  }
-};
-
-var env = Handlebars.create();
-env.JavaScriptCompiler = MyCompiler;
-env.compile('my template');
-```
diff --git a/lib/handlebars/lib/handlebars.js b/lib/handlebars/lib/handlebars.js
deleted file mode 100644
index f11495905..000000000
--- a/lib/handlebars/lib/handlebars.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import runtime from './handlebars.runtime';
-
-// Compiler imports
-import AST from './handlebars/compiler/ast';
-import { parser as Parser, parse } from './handlebars/compiler/base';
-import { Compiler, compile, precompile } from './handlebars/compiler/compiler';
-import JavaScriptCompiler from './handlebars/compiler/javascript-compiler';
-import Visitor from './handlebars/compiler/visitor';
-
-import noConflict from './handlebars/no-conflict';
-
-let _create = runtime.create;
-function create() {
-  let hb = _create();
-
-  hb.compile = function(input, options) {
-    return compile(input, options, hb);
-  };
-  hb.precompile = function(input, options) {
-    return precompile(input, options, hb);
-  };
-
-  hb.AST = AST;
-  hb.Compiler = Compiler;
-  hb.JavaScriptCompiler = JavaScriptCompiler;
-  hb.Parser = Parser;
-  hb.parse = parse;
-
-  return hb;
-}
-
-let inst = create();
-inst.create = create;
-
-noConflict(inst);
-
-inst.Visitor = Visitor;
-
-inst['default'] = inst;
-
-export default inst;
diff --git a/lib/handlebars/lib/handlebars.runtime.js b/lib/handlebars/lib/handlebars.runtime.js
deleted file mode 100644
index 3d05b5448..000000000
--- a/lib/handlebars/lib/handlebars.runtime.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as base from './handlebars/base';
-
-// Each of these augment the Handlebars object. No need to setup here.
-// (This is done to easily share code between commonjs and browse envs)
-import SafeString from './handlebars/safe-string';
-import Exception from './handlebars/exception';
-import * as Utils from './handlebars/utils';
-import * as runtime from './handlebars/runtime';
-
-import noConflict from './handlebars/no-conflict';
-
-// For compatibility and usage outside of module systems, make the Handlebars object a namespace
-function create() {
-  let hb = new base.HandlebarsEnvironment();
-
-  Utils.extend(hb, base);
-  hb.SafeString = SafeString;
-  hb.Exception = Exception;
-  hb.Utils = Utils;
-  hb.escapeExpression = Utils.escapeExpression;
-
-  hb.VM = runtime;
-  hb.template = function(spec) {
-    return runtime.template(spec, hb);
-  };
-
-  return hb;
-}
-
-let inst = create();
-inst.create = create;
-
-noConflict(inst);
-
-inst['default'] = inst;
-
-export default inst;
diff --git a/lib/handlebars/lib/handlebars/base.js b/lib/handlebars/lib/handlebars/base.js
deleted file mode 100644
index cfe1e917c..000000000
--- a/lib/handlebars/lib/handlebars/base.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import * as Utils from './utils';
-import Exception from './exception';
-
-export const VERSION = '3.0.1';
-export const COMPILER_REVISION = 6;
-
-export const REVISION_CHANGES = {
-  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '== 1.0.0-rc.3',
-  3: '== 1.0.0-rc.4',
-  4: '== 1.x.x',
-  5: '== 2.0.0-alpha.x',
-  6: '>= 2.0.0-beta.1'
-};
-
-const isArray = Utils.isArray,
-      isFunction = Utils.isFunction,
-      toString = Utils.toString,
-      objectType = '[object Object]';
-
-export function HandlebarsEnvironment(helpers, partials) {
-  this.helpers = helpers || {};
-  this.partials = partials || {};
-
-  registerDefaultHelpers(this);
-}
-
-HandlebarsEnvironment.prototype = {
-  constructor: HandlebarsEnvironment,
-
-  logger: logger,
-  log: log,
-
-  registerHelper: function(name, fn) {
-    if (toString.call(name) === objectType) {
-      if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-      Utils.extend(this.helpers, name);
-    } else {
-      this.helpers[name] = fn;
-    }
-  },
-  unregisterHelper: function(name) {
-    delete this.helpers[name];
-  },
-
-  registerPartial: function(name, partial) {
-    if (toString.call(name) === objectType) {
-      Utils.extend(this.partials, name);
-    } else {
-      if (typeof partial === 'undefined') {
-        throw new Exception('Attempting to register a partial as undefined');
-      }
-      this.partials[name] = partial;
-    }
-  },
-  unregisterPartial: function(name) {
-    delete this.partials[name];
-  }
-};
-
-function registerDefaultHelpers(instance) {
-  instance.registerHelper('helperMissing', function(/* [args, ]options */) {
-    if (arguments.length === 1) {
-      // A missing field in a {{foo}} constuct.
-      return undefined;
-    } else {
-      // Someone is actually trying to call something, blow up.
-      throw new Exception('Missing helper: "' + arguments[arguments.length - 1].name + '"');
-    }
-  });
-
-  instance.registerHelper('blockHelperMissing', function(context, options) {
-    let inverse = options.inverse,
-        fn = options.fn;
-
-    if (context === true) {
-      return fn(this);
-    } else if (context === false || context == null) {
-      return inverse(this);
-    } else if (isArray(context)) {
-      if (context.length > 0) {
-        if (options.ids) {
-          options.ids = [options.name];
-        }
-
-        return instance.helpers.each(context, options);
-      } else {
-        return inverse(this);
-      }
-    } else {
-      if (options.data && options.ids) {
-        let data = createFrame(options.data);
-        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
-        options = {data: data};
-      }
-
-      return fn(context, options);
-    }
-  });
-
-  instance.registerHelper('each', function(context, options) {
-    if (!options) {
-      throw new Exception('Must pass iterator to #each');
-    }
-
-    let fn = options.fn,
-        inverse = options.inverse,
-        i = 0,
-        ret = '',
-        data,
-        contextPath;
-
-    if (options.data && options.ids) {
-      contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-    }
-
-    if (isFunction(context)) { context = context.call(this); }
-
-    if (options.data) {
-      data = createFrame(options.data);
-    }
-
-    function execIteration(field, index, last) {
-      if (data) {
-        data.key = field;
-        data.index = index;
-        data.first = index === 0;
-        data.last = !!last;
-
-        if (contextPath) {
-          data.contextPath = contextPath + field;
-        }
-      }
-
-      ret = ret + fn(context[field], {
-        data: data,
-        blockParams: Utils.blockParams([context[field], field], [contextPath + field, null])
-      });
-    }
-
-    if (context && typeof context === 'object') {
-      if (isArray(context)) {
-        for (let j = context.length; i < j; i++) {
-          execIteration(i, i, i === context.length - 1);
-        }
-      } else {
-        let priorKey;
-
-        for (let key in context) {
-          if (context.hasOwnProperty(key)) {
-            // We're running the iterations one step out of sync so we can detect
-            // the last iteration without have to scan the object twice and create
-            // an itermediate keys array.
-            if (priorKey) {
-              execIteration(priorKey, i - 1);
-            }
-            priorKey = key;
-            i++;
-          }
-        }
-        if (priorKey) {
-          execIteration(priorKey, i - 1, true);
-        }
-      }
-    }
-
-    if (i === 0) {
-      ret = inverse(this);
-    }
-
-    return ret;
-  });
-
-  instance.registerHelper('if', function(conditional, options) {
-    if (isFunction(conditional)) { conditional = conditional.call(this); }
-
-    // Default behavior is to render the positive path if the value is truthy and not empty.
-    // The `includeZero` option may be set to treat the condtional as purely not empty based on the
-    // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-    if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
-      return options.inverse(this);
-    } else {
-      return options.fn(this);
-    }
-  });
-
-  instance.registerHelper('unless', function(conditional, options) {
-    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-  });
-
-  instance.registerHelper('with', function(context, options) {
-    if (isFunction(context)) { context = context.call(this); }
-
-    let fn = options.fn;
-
-    if (!Utils.isEmpty(context)) {
-      if (options.data && options.ids) {
-        let data = createFrame(options.data);
-        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
-        options = {data: data};
-      }
-
-      return fn(context, options);
-    } else {
-      return options.inverse(this);
-    }
-  });
-
-  instance.registerHelper('log', function(message, options) {
-    let level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-    instance.log(level, message);
-  });
-
-  instance.registerHelper('lookup', function(obj, field) {
-    return obj && obj[field];
-  });
-}
-
-export let logger = {
-  methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
-
-  // State enum
-  DEBUG: 0,
-  INFO: 1,
-  WARN: 2,
-  ERROR: 3,
-  level: 1,
-
-  // Can be overridden in the host environment
-  log: function(level, message) {
-    if (typeof console !== 'undefined' && logger.level <= level) {
-      let method = logger.methodMap[level];
-      (console[method] || console.log).call(console, message);    // eslint-disable-line no-console
-    }
-  }
-};
-
-export let log = logger.log;
-
-export function createFrame(object) {
-  let frame = Utils.extend({}, object);
-  frame._parent = object;
-  return frame;
-}
diff --git a/lib/handlebars/lib/handlebars/compiler/ast.js b/lib/handlebars/lib/handlebars/compiler/ast.js
deleted file mode 100644
index 08b127f77..000000000
--- a/lib/handlebars/lib/handlebars/compiler/ast.js
+++ /dev/null
@@ -1,152 +0,0 @@
-let AST = {
-  Program: function(statements, blockParams, strip, locInfo) {
-    this.loc = locInfo;
-    this.type = 'Program';
-    this.body = statements;
-
-    this.blockParams = blockParams;
-    this.strip = strip;
-  },
-
-  MustacheStatement: function(path, params, hash, escaped, strip, locInfo) {
-    this.loc = locInfo;
-    this.type = 'MustacheStatement';
-
-    this.path = path;
-    this.params = params || [];
-    this.hash = hash;
-    this.escaped = escaped;
-
-    this.strip = strip;
-  },
-
-  BlockStatement: function(path, params, hash, program, inverse, openStrip, inverseStrip, closeStrip, locInfo) {
-    this.loc = locInfo;
-    this.type = 'BlockStatement';
-
-    this.path = path;
-    this.params = params || [];
-    this.hash = hash;
-    this.program = program;
-    this.inverse = inverse;
-
-    this.openStrip = openStrip;
-    this.inverseStrip = inverseStrip;
-    this.closeStrip = closeStrip;
-  },
-
-  PartialStatement: function(name, params, hash, strip, locInfo) {
-    this.loc = locInfo;
-    this.type = 'PartialStatement';
-
-    this.name = name;
-    this.params = params || [];
-    this.hash = hash;
-
-    this.indent = '';
-    this.strip = strip;
-  },
-
-  ContentStatement: function(string, locInfo) {
-    this.loc = locInfo;
-    this.type = 'ContentStatement';
-    this.original = this.value = string;
-  },
-
-  CommentStatement: function(comment, strip, locInfo) {
-    this.loc = locInfo;
-    this.type = 'CommentStatement';
-    this.value = comment;
-
-    this.strip = strip;
-  },
-
-  SubExpression: function(path, params, hash, locInfo) {
-    this.loc = locInfo;
-
-    this.type = 'SubExpression';
-    this.path = path;
-    this.params = params || [];
-    this.hash = hash;
-  },
-
-  PathExpression: function(data, depth, parts, original, locInfo) {
-    this.loc = locInfo;
-    this.type = 'PathExpression';
-
-    this.data = data;
-    this.original = original;
-    this.parts = parts;
-    this.depth = depth;
-  },
-
-  StringLiteral: function(string, locInfo) {
-    this.loc = locInfo;
-    this.type = 'StringLiteral';
-    this.original =
-      this.value = string;
-  },
-
-  NumberLiteral: function(number, locInfo) {
-    this.loc = locInfo;
-    this.type = 'NumberLiteral';
-    this.original =
-      this.value = Number(number);
-  },
-
-  BooleanLiteral: function(bool, locInfo) {
-    this.loc = locInfo;
-    this.type = 'BooleanLiteral';
-    this.original =
-      this.value = bool === 'true';
-  },
-
-  UndefinedLiteral: function(locInfo) {
-    this.loc = locInfo;
-    this.type = 'UndefinedLiteral';
-    this.original = this.value = undefined;
-  },
-
-  NullLiteral: function(locInfo) {
-    this.loc = locInfo;
-    this.type = 'NullLiteral';
-    this.original = this.value = null;
-  },
-
-  Hash: function(pairs, locInfo) {
-    this.loc = locInfo;
-    this.type = 'Hash';
-    this.pairs = pairs;
-  },
-  HashPair: function(key, value, locInfo) {
-    this.loc = locInfo;
-    this.type = 'HashPair';
-    this.key = key;
-    this.value = value;
-  },
-
-  // Public API used to evaluate derived attributes regarding AST nodes
-  helpers: {
-    // a mustache is definitely a helper if:
-    // * it is an eligible helper, and
-    // * it has at least one parameter or hash segment
-    helperExpression: function(node) {
-      return !!(node.type === 'SubExpression' || node.params.length || node.hash);
-    },
-
-    scopedId: function(path) {
-      return (/^\.|this\b/).test(path.original);
-    },
-
-    // an ID is simple if it only has one part, and that part is not
-    // `..` or `this`.
-    simpleId: function(path) {
-      return path.parts.length === 1 && !AST.helpers.scopedId(path) && !path.depth;
-    }
-  }
-};
-
-
-// Must be exported as an object rather than the root of the module as the jison lexer
-// must modify the object to operate properly.
-export default AST;
diff --git a/lib/handlebars/lib/handlebars/compiler/base.js b/lib/handlebars/lib/handlebars/compiler/base.js
deleted file mode 100644
index 7075d9bd8..000000000
--- a/lib/handlebars/lib/handlebars/compiler/base.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import parser from './parser';
-import AST from './ast';
-import WhitespaceControl from './whitespace-control';
-import * as Helpers from './helpers';
-import { extend } from '../utils';
-
-export { parser };
-
-let yy = {};
-extend(yy, Helpers, AST);
-
-export function parse(input, options) {
-  // Just return if an already-compiled AST was passed in.
-  if (input.type === 'Program') { return input; }
-
-  parser.yy = yy;
-
-  // Altering the shared object here, but this is ok as parser is a sync operation
-  yy.locInfo = function(locInfo) {
-    return new yy.SourceLocation(options && options.srcName, locInfo);
-  };
-
-  let strip = new WhitespaceControl();
-  return strip.accept(parser.parse(input));
-}
diff --git a/lib/handlebars/lib/handlebars/compiler/code-gen.js b/lib/handlebars/lib/handlebars/compiler/code-gen.js
deleted file mode 100644
index bc7bc0703..000000000
--- a/lib/handlebars/lib/handlebars/compiler/code-gen.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/*global define */
-import {isArray} from '../utils';
-
-let SourceNode;
-
-try {
-  /* istanbul ignore next */
-  if (typeof define !== 'function' || !define.amd) {
-    // We don't support this in AMD environments. For these environments, we asusme that
-    // they are running on the browser and thus have no need for the source-map library.
-    let SourceMap = require('source-map');
-    SourceNode = SourceMap.SourceNode;
-  }
-} catch (err) {
-  /* NOP */
-}
-
-/* istanbul ignore if: tested but not covered in istanbul due to dist build  */
-if (!SourceNode) {
-  SourceNode = function(line, column, srcFile, chunks) {
-    this.src = '';
-    if (chunks) {
-      this.add(chunks);
-    }
-  };
-  /* istanbul ignore next */
-  SourceNode.prototype = {
-    add: function(chunks) {
-      if (isArray(chunks)) {
-        chunks = chunks.join('');
-      }
-      this.src += chunks;
-    },
-    prepend: function(chunks) {
-      if (isArray(chunks)) {
-        chunks = chunks.join('');
-      }
-      this.src = chunks + this.src;
-    },
-    toStringWithSourceMap: function() {
-      return {code: this.toString()};
-    },
-    toString: function() {
-      return this.src;
-    }
-  };
-}
-
-
-function castChunk(chunk, codeGen, loc) {
-  if (isArray(chunk)) {
-    let ret = [];
-
-    for (let i = 0, len = chunk.length; i < len; i++) {
-      ret.push(codeGen.wrap(chunk[i], loc));
-    }
-    return ret;
-  } else if (typeof chunk === 'boolean' || typeof chunk === 'number') {
-    // Handle primitives that the SourceNode will throw up on
-    return chunk + '';
-  }
-  return chunk;
-}
-
-
-function CodeGen(srcFile) {
-  this.srcFile = srcFile;
-  this.source = [];
-}
-
-CodeGen.prototype = {
-  prepend: function(source, loc) {
-    this.source.unshift(this.wrap(source, loc));
-  },
-  push: function(source, loc) {
-    this.source.push(this.wrap(source, loc));
-  },
-
-  merge: function() {
-    let source = this.empty();
-    this.each(function(line) {
-      source.add(['  ', line, '\n']);
-    });
-    return source;
-  },
-
-  each: function(iter) {
-    for (let i = 0, len = this.source.length; i < len; i++) {
-      iter(this.source[i]);
-    }
-  },
-
-  empty: function(loc = this.currentLocation || {start: {}}) {
-    return new SourceNode(loc.start.line, loc.start.column, this.srcFile);
-  },
-  wrap: function(chunk, loc = this.currentLocation || {start: {}}) {
-    if (chunk instanceof SourceNode) {
-      return chunk;
-    }
-
-    chunk = castChunk(chunk, this, loc);
-
-    return new SourceNode(loc.start.line, loc.start.column, this.srcFile, chunk);
-  },
-
-  functionCall: function(fn, type, params) {
-    params = this.generateList(params);
-    return this.wrap([fn, type ? '.' + type + '(' : '(', params, ')']);
-  },
-
-  quotedString: function(str) {
-    return '"' + (str + '')
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-      .replace(/\u2029/g, '\\u2029') + '"';
-  },
-
-  objectLiteral: function(obj) {
-    let pairs = [];
-
-    for (let key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        let value = castChunk(obj[key], this);
-        if (value !== 'undefined') {
-          pairs.push([this.quotedString(key), ':', value]);
-        }
-      }
-    }
-
-    let ret = this.generateList(pairs);
-    ret.prepend('{');
-    ret.add('}');
-    return ret;
-  },
-
-
-  generateList: function(entries, loc) {
-    let ret = this.empty(loc);
-
-    for (let i = 0, len = entries.length; i < len; i++) {
-      if (i) {
-        ret.add(',');
-      }
-
-      ret.add(castChunk(entries[i], this, loc));
-    }
-
-    return ret;
-  },
-
-  generateArray: function(entries, loc) {
-    let ret = this.generateList(entries, loc);
-    ret.prepend('[');
-    ret.add(']');
-
-    return ret;
-  }
-};
-
-export default CodeGen;
-
diff --git a/lib/handlebars/lib/handlebars/compiler/compiler.js b/lib/handlebars/lib/handlebars/compiler/compiler.js
deleted file mode 100644
index 457542162..000000000
--- a/lib/handlebars/lib/handlebars/compiler/compiler.js
+++ /dev/null
@@ -1,513 +0,0 @@
-import Exception from '../exception';
-import {isArray, indexOf} from '../utils';
-import AST from './ast';
-
-const slice = [].slice;
-
-export function Compiler() {}
-
-// the foundHelper register will disambiguate helper lookup from finding a
-// function in a context. This is necessary for mustache compatibility, which
-// requires that context functions in blocks are evaluated by blockHelperMissing,
-// and then proceed as if the resulting value was provided to blockHelperMissing.
-
-Compiler.prototype = {
-  compiler: Compiler,
-
-  equals: function(other) {
-    let len = this.opcodes.length;
-    if (other.opcodes.length !== len) {
-      return false;
-    }
-
-    for (let i = 0; i < len; i++) {
-      let opcode = this.opcodes[i],
-          otherOpcode = other.opcodes[i];
-      if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
-        return false;
-      }
-    }
-
-    // We know that length is the same between the two arrays because they are directly tied
-    // to the opcode behavior above.
-    len = this.children.length;
-    for (let i = 0; i < len; i++) {
-      if (!this.children[i].equals(other.children[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  guid: 0,
-
-  compile: function(program, options) {
-    this.sourceNode = [];
-    this.opcodes = [];
-    this.children = [];
-    this.options = options;
-    this.stringParams = options.stringParams;
-    this.trackIds = options.trackIds;
-
-    options.blockParams = options.blockParams || [];
-
-    // These changes will propagate to the other compiler components
-    let knownHelpers = options.knownHelpers;
-    options.knownHelpers = {
-      'helperMissing': true,
-      'blockHelperMissing': true,
-      'each': true,
-      'if': true,
-      'unless': true,
-      'with': true,
-      'log': true,
-      'lookup': true
-    };
-    if (knownHelpers) {
-      for (let name in knownHelpers) {
-        if (name in knownHelpers) {
-          options.knownHelpers[name] = knownHelpers[name];
-        }
-      }
-    }
-
-    return this.accept(program);
-  },
-
-  compileProgram: function(program) {
-    let childCompiler = new this.compiler(), // eslint-disable-line new-cap
-        result = childCompiler.compile(program, this.options),
-        guid = this.guid++;
-
-    this.usePartial = this.usePartial || result.usePartial;
-
-    this.children[guid] = result;
-    this.useDepths = this.useDepths || result.useDepths;
-
-    return guid;
-  },
-
-  accept: function(node) {
-    this.sourceNode.unshift(node);
-    let ret = this[node.type](node);
-    this.sourceNode.shift();
-    return ret;
-  },
-
-  Program: function(program) {
-    this.options.blockParams.unshift(program.blockParams);
-
-    let body = program.body,
-        bodyLength = body.length;
-    for (let i = 0; i < bodyLength; i++) {
-      this.accept(body[i]);
-    }
-
-    this.options.blockParams.shift();
-
-    this.isSimple = bodyLength === 1;
-    this.blockParams = program.blockParams ? program.blockParams.length : 0;
-
-    return this;
-  },
-
-  BlockStatement: function(block) {
-    transformLiteralToPath(block);
-
-    let program = block.program,
-        inverse = block.inverse;
-
-    program = program && this.compileProgram(program);
-    inverse = inverse && this.compileProgram(inverse);
-
-    let type = this.classifySexpr(block);
-
-    if (type === 'helper') {
-      this.helperSexpr(block, program, inverse);
-    } else if (type === 'simple') {
-      this.simpleSexpr(block);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('blockValue', block.path.original);
-    } else {
-      this.ambiguousSexpr(block, program, inverse);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('ambiguousBlockValue');
-    }
-
-    this.opcode('append');
-  },
-
-  PartialStatement: function(partial) {
-    this.usePartial = true;
-
-    let params = partial.params;
-    if (params.length > 1) {
-      throw new Exception('Unsupported number of partial arguments: ' + params.length, partial);
-    } else if (!params.length) {
-      params.push({type: 'PathExpression', parts: [], depth: 0});
-    }
-
-    let partialName = partial.name.original,
-        isDynamic = partial.name.type === 'SubExpression';
-    if (isDynamic) {
-      this.accept(partial.name);
-    }
-
-    this.setupFullMustacheParams(partial, undefined, undefined, true);
-
-    let indent = partial.indent || '';
-    if (this.options.preventIndent && indent) {
-      this.opcode('appendContent', indent);
-      indent = '';
-    }
-
-    this.opcode('invokePartial', isDynamic, partialName, indent);
-    this.opcode('append');
-  },
-
-  MustacheStatement: function(mustache) {
-    this.SubExpression(mustache);   // eslint-disable-line new-cap
-
-    if (mustache.escaped && !this.options.noEscape) {
-      this.opcode('appendEscaped');
-    } else {
-      this.opcode('append');
-    }
-  },
-
-  ContentStatement: function(content) {
-    if (content.value) {
-      this.opcode('appendContent', content.value);
-    }
-  },
-
-  CommentStatement: function() {},
-
-  SubExpression: function(sexpr) {
-    transformLiteralToPath(sexpr);
-    let type = this.classifySexpr(sexpr);
-
-    if (type === 'simple') {
-      this.simpleSexpr(sexpr);
-    } else if (type === 'helper') {
-      this.helperSexpr(sexpr);
-    } else {
-      this.ambiguousSexpr(sexpr);
-    }
-  },
-  ambiguousSexpr: function(sexpr, program, inverse) {
-    let path = sexpr.path,
-        name = path.parts[0],
-        isBlock = program != null || inverse != null;
-
-    this.opcode('getContext', path.depth);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    this.accept(path);
-
-    this.opcode('invokeAmbiguous', name, isBlock);
-  },
-
-  simpleSexpr: function(sexpr) {
-    this.accept(sexpr.path);
-    this.opcode('resolvePossibleLambda');
-  },
-
-  helperSexpr: function(sexpr, program, inverse) {
-    let params = this.setupFullMustacheParams(sexpr, program, inverse),
-        path = sexpr.path,
-        name = path.parts[0];
-
-    if (this.options.knownHelpers[name]) {
-      this.opcode('invokeKnownHelper', params.length, name);
-    } else if (this.options.knownHelpersOnly) {
-      throw new Exception('You specified knownHelpersOnly, but used the unknown helper ' + name, sexpr);
-    } else {
-      path.falsy = true;
-
-      this.accept(path);
-      this.opcode('invokeHelper', params.length, path.original, AST.helpers.simpleId(path));
-    }
-  },
-
-  PathExpression: function(path) {
-    this.addDepth(path.depth);
-    this.opcode('getContext', path.depth);
-
-    let name = path.parts[0],
-        scoped = AST.helpers.scopedId(path),
-        blockParamId = !path.depth && !scoped && this.blockParamIndex(name);
-
-    if (blockParamId) {
-      this.opcode('lookupBlockParam', blockParamId, path.parts);
-    } else if (!name) {
-      // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
-      this.opcode('pushContext');
-    } else if (path.data) {
-      this.options.data = true;
-      this.opcode('lookupData', path.depth, path.parts);
-    } else {
-      this.opcode('lookupOnContext', path.parts, path.falsy, scoped);
-    }
-  },
-
-  StringLiteral: function(string) {
-    this.opcode('pushString', string.value);
-  },
-
-  NumberLiteral: function(number) {
-    this.opcode('pushLiteral', number.value);
-  },
-
-  BooleanLiteral: function(bool) {
-    this.opcode('pushLiteral', bool.value);
-  },
-
-  UndefinedLiteral: function() {
-    this.opcode('pushLiteral', 'undefined');
-  },
-
-  NullLiteral: function() {
-    this.opcode('pushLiteral', 'null');
-  },
-
-  Hash: function(hash) {
-    let pairs = hash.pairs,
-        i = 0,
-        l = pairs.length;
-
-    this.opcode('pushHash');
-
-    for (; i < l; i++) {
-      this.pushParam(pairs[i].value);
-    }
-    while (i--) {
-      this.opcode('assignToHash', pairs[i].key);
-    }
-    this.opcode('popHash');
-  },
-
-  // HELPERS
-  opcode: function(name) {
-    this.opcodes.push({ opcode: name, args: slice.call(arguments, 1), loc: this.sourceNode[0].loc });
-  },
-
-  addDepth: function(depth) {
-    if (!depth) {
-      return;
-    }
-
-    this.useDepths = true;
-  },
-
-  classifySexpr: function(sexpr) {
-    let isSimple = AST.helpers.simpleId(sexpr.path);
-
-    let isBlockParam = isSimple && !!this.blockParamIndex(sexpr.path.parts[0]);
-
-    // a mustache is an eligible helper if:
-    // * its id is simple (a single part, not `this` or `..`)
-    let isHelper = !isBlockParam && AST.helpers.helperExpression(sexpr);
-
-    // if a mustache is an eligible helper but not a definite
-    // helper, it is ambiguous, and will be resolved in a later
-    // pass or at runtime.
-    let isEligible = !isBlockParam && (isHelper || isSimple);
-
-    // if ambiguous, we can possibly resolve the ambiguity now
-    // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
-    if (isEligible && !isHelper) {
-      let name = sexpr.path.parts[0],
-          options = this.options;
-
-      if (options.knownHelpers[name]) {
-        isHelper = true;
-      } else if (options.knownHelpersOnly) {
-        isEligible = false;
-      }
-    }
-
-    if (isHelper) {
-      return 'helper';
-    } else if (isEligible) {
-      return 'ambiguous';
-    } else {
-      return 'simple';
-    }
-  },
-
-  pushParams: function(params) {
-    for (let i = 0, l = params.length; i < l; i++) {
-      this.pushParam(params[i]);
-    }
-  },
-
-  pushParam: function(val) {
-    let value = val.value != null ? val.value : val.original || '';
-
-    if (this.stringParams) {
-      if (value.replace) {
-        value = value
-            .replace(/^(\.?\.\/)*/g, '')
-            .replace(/\//g, '.');
-      }
-
-      if (val.depth) {
-        this.addDepth(val.depth);
-      }
-      this.opcode('getContext', val.depth || 0);
-      this.opcode('pushStringParam', value, val.type);
-
-      if (val.type === 'SubExpression') {
-        // SubExpressions get evaluated and passed in
-        // in string params mode.
-        this.accept(val);
-      }
-    } else {
-      if (this.trackIds) {
-        let blockParamIndex;
-        if (val.parts && !AST.helpers.scopedId(val) && !val.depth) {
-           blockParamIndex = this.blockParamIndex(val.parts[0]);
-        }
-        if (blockParamIndex) {
-          let blockParamChild = val.parts.slice(1).join('.');
-          this.opcode('pushId', 'BlockParam', blockParamIndex, blockParamChild);
-        } else {
-          value = val.original || value;
-          if (value.replace) {
-            value = value
-                .replace(/^\.\//g, '')
-                .replace(/^\.$/g, '');
-          }
-
-          this.opcode('pushId', val.type, value);
-        }
-      }
-      this.accept(val);
-    }
-  },
-
-  setupFullMustacheParams: function(sexpr, program, inverse, omitEmpty) {
-    let params = sexpr.params;
-    this.pushParams(params);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    if (sexpr.hash) {
-      this.accept(sexpr.hash);
-    } else {
-      this.opcode('emptyHash', omitEmpty);
-    }
-
-    return params;
-  },
-
-  blockParamIndex: function(name) {
-    for (let depth = 0, len = this.options.blockParams.length; depth < len; depth++) {
-      let blockParams = this.options.blockParams[depth],
-          param = blockParams && indexOf(blockParams, name);
-      if (blockParams && param >= 0) {
-        return [depth, param];
-      }
-    }
-  }
-};
-
-export function precompile(input, options, env) {
-  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    throw new Exception('You must pass a string or Handlebars AST to Handlebars.precompile. You passed ' + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  if (options.compat) {
-    options.useDepths = true;
-  }
-
-  let ast = env.parse(input, options),
-      environment = new env.Compiler().compile(ast, options);
-  return new env.JavaScriptCompiler().compile(environment, options);
-}
-
-export function compile(input, options = {}, env) {
-  if (input == null || (typeof input !== 'string' && input.type !== 'Program')) {
-    throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
-  }
-
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  if (options.compat) {
-    options.useDepths = true;
-  }
-
-  let compiled;
-
-  function compileInput() {
-    let ast = env.parse(input, options),
-        environment = new env.Compiler().compile(ast, options),
-        templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
-    return env.template(templateSpec);
-  }
-
-  // Template is only compiled on first use and cached after that point.
-  function ret(context, execOptions) {
-    if (!compiled) {
-      compiled = compileInput();
-    }
-    return compiled.call(this, context, execOptions);
-  }
-  ret._setup = function(setupOptions) {
-    if (!compiled) {
-      compiled = compileInput();
-    }
-    return compiled._setup(setupOptions);
-  };
-  ret._child = function(i, data, blockParams, depths) {
-    if (!compiled) {
-      compiled = compileInput();
-    }
-    return compiled._child(i, data, blockParams, depths);
-  };
-  return ret;
-}
-
-function argEquals(a, b) {
-  if (a === b) {
-    return true;
-  }
-
-  if (isArray(a) && isArray(b) && a.length === b.length) {
-    for (let i = 0; i < a.length; i++) {
-      if (!argEquals(a[i], b[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
-
-function transformLiteralToPath(sexpr) {
-  if (!sexpr.path.parts) {
-    let literal = sexpr.path;
-    // Casting to string here to make false and 0 literal values play nicely with the rest
-    // of the system.
-    sexpr.path = new AST.PathExpression(false, 0, [literal.original + ''], literal.original + '', literal.loc);
-  }
-}
diff --git a/lib/handlebars/lib/handlebars/compiler/helpers.js b/lib/handlebars/lib/handlebars/compiler/helpers.js
deleted file mode 100644
index fc0120c4f..000000000
--- a/lib/handlebars/lib/handlebars/compiler/helpers.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import Exception from '../exception';
-
-export function SourceLocation(source, locInfo) {
-  this.source = source;
-  this.start = {
-    line: locInfo.first_line,
-    column: locInfo.first_column
-  };
-  this.end = {
-    line: locInfo.last_line,
-    column: locInfo.last_column
-  };
-}
-
-export function id(token) {
-  if (/^\[.*\]$/.test(token)) {
-    return token.substr(1, token.length - 2);
-  } else {
-    return token;
-  }
-}
-
-export function stripFlags(open, close) {
-  return {
-    open: open.charAt(2) === '~',
-    close: close.charAt(close.length - 3) === '~'
-  };
-}
-
-export function stripComment(comment) {
-  return comment.replace(/^\{\{~?\!-?-?/, '')
-                .replace(/-?-?~?\}\}$/, '');
-}
-
-export function preparePath(data, parts, locInfo) {
-  locInfo = this.locInfo(locInfo);
-
-  let original = data ? '@' : '',
-      dig = [],
-      depth = 0,
-      depthString = '';
-
-  for (let i = 0, l = parts.length; i < l; i++) {
-    let part = parts[i].part,
-        // If we have [] syntax then we do not treat path references as operators,
-        // i.e. foo.[this] resolves to approximately context.foo['this']
-        isLiteral = parts[i].original !== part;
-    original += (parts[i].separator || '') + part;
-
-    if (!isLiteral && (part === '..' || part === '.' || part === 'this')) {
-      if (dig.length > 0) {
-        throw new Exception('Invalid path: ' + original, {loc: locInfo});
-      } else if (part === '..') {
-        depth++;
-        depthString += '../';
-      }
-    } else {
-      dig.push(part);
-    }
-  }
-
-  return new this.PathExpression(data, depth, dig, original, locInfo);
-}
-
-export function prepareMustache(path, params, hash, open, strip, locInfo) {
-  // Must use charAt to support IE pre-10
-  let escapeFlag = open.charAt(3) || open.charAt(2),
-      escaped = escapeFlag !== '{' && escapeFlag !== '&';
-
-  return new this.MustacheStatement(path, params, hash, escaped, strip, this.locInfo(locInfo));
-}
-
-export function prepareRawBlock(openRawBlock, content, close, locInfo) {
-  if (openRawBlock.path.original !== close) {
-    let errorNode = {loc: openRawBlock.path.loc};
-
-    throw new Exception(openRawBlock.path.original + " doesn't match " + close, errorNode);
-  }
-
-  locInfo = this.locInfo(locInfo);
-  let program = new this.Program([content], null, {}, locInfo);
-
-  return new this.BlockStatement(
-      openRawBlock.path, openRawBlock.params, openRawBlock.hash,
-      program, undefined,
-      {}, {}, {},
-      locInfo);
-}
-
-export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
-  // When we are chaining inverse calls, we will not have a close path
-  if (close && close.path && openBlock.path.original !== close.path.original) {
-    let errorNode = {loc: openBlock.path.loc};
-
-    throw new Exception(openBlock.path.original + ' doesn\'t match ' + close.path.original, errorNode);
-  }
-
-  program.blockParams = openBlock.blockParams;
-
-  let inverse,
-      inverseStrip;
-
-  if (inverseAndProgram) {
-    if (inverseAndProgram.chain) {
-      inverseAndProgram.program.body[0].closeStrip = close.strip;
-    }
-
-    inverseStrip = inverseAndProgram.strip;
-    inverse = inverseAndProgram.program;
-  }
-
-  if (inverted) {
-    inverted = inverse;
-    inverse = program;
-    program = inverted;
-  }
-
-  return new this.BlockStatement(
-      openBlock.path, openBlock.params, openBlock.hash,
-      program, inverse,
-      openBlock.strip, inverseStrip, close && close.strip,
-      this.locInfo(locInfo));
-}
diff --git a/lib/handlebars/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/lib/handlebars/compiler/javascript-compiler.js
deleted file mode 100644
index 883066165..000000000
--- a/lib/handlebars/lib/handlebars/compiler/javascript-compiler.js
+++ /dev/null
@@ -1,1070 +0,0 @@
-import { COMPILER_REVISION, REVISION_CHANGES } from '../base';
-import Exception from '../exception';
-import {isArray} from '../utils';
-import CodeGen from './code-gen';
-
-function Literal(value) {
-  this.value = value;
-}
-
-function JavaScriptCompiler() {}
-
-JavaScriptCompiler.prototype = {
-  // PUBLIC API: You can override these methods in a subclass to provide
-  // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /* , type*/) {
-    if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-      return [parent, '.', name];
-    } else {
-      return [parent, "['", name, "']"];
-    }
-  },
-  depthedLookup: function(name) {
-    return [this.aliasable('this.lookup'), '(depths, "', name, '")'];
-  },
-
-  compilerInfo: function() {
-    const revision = COMPILER_REVISION,
-          versions = REVISION_CHANGES[revision];
-    return [revision, versions];
-  },
-
-  appendToBuffer: function(source, location, explicit) {
-    // Force a source as this simplifies the merge logic.
-    if (!isArray(source)) {
-      source = [source];
-    }
-    source = this.source.wrap(source, location);
-
-    if (this.environment.isSimple) {
-      return ['return ', source, ';'];
-    } else if (explicit) {
-      // This is a case where the buffer operation occurs as a child of another
-      // construct, generally braces. We have to explicitly output these buffer
-      // operations to ensure that the emitted code goes in the correct location.
-      return ['buffer += ', source, ';'];
-    } else {
-      source.appendToBuffer = true;
-      return source;
-    }
-  },
-
-  initializeBuffer: function() {
-    return this.quotedString('');
-  },
-  // END PUBLIC API
-
-  compile: function(environment, options, context, asObject) {
-    this.environment = environment;
-    this.options = options;
-    this.stringParams = this.options.stringParams;
-    this.trackIds = this.options.trackIds;
-    this.precompile = !asObject;
-
-    this.name = this.environment.name;
-    this.isChild = !!context;
-    this.context = context || {
-      programs: [],
-      environments: []
-    };
-
-    this.preamble();
-
-    this.stackSlot = 0;
-    this.stackVars = [];
-    this.aliases = {};
-    this.registers = { list: [] };
-    this.hashes = [];
-    this.compileStack = [];
-    this.inlineStack = [];
-    this.blockParams = [];
-
-    this.compileChildren(environment, options);
-
-    this.useDepths = this.useDepths || environment.useDepths || this.options.compat;
-    this.useBlockParams = this.useBlockParams || environment.useBlockParams;
-
-    let opcodes = environment.opcodes,
-        opcode,
-        firstLoc,
-        i,
-        l;
-
-    for (i = 0, l = opcodes.length; i < l; i++) {
-      opcode = opcodes[i];
-
-      this.source.currentLocation = opcode.loc;
-      firstLoc = firstLoc || opcode.loc;
-      this[opcode.opcode].apply(this, opcode.args);
-    }
-
-    // Flush any trailing content that might be pending.
-    this.source.currentLocation = firstLoc;
-    this.pushSource('');
-
-    /* istanbul ignore next */
-    if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
-      throw new Exception('Compile completed with content left on stack');
-    }
-
-    let fn = this.createFunctionContext(asObject);
-    if (!this.isChild) {
-      let ret = {
-        compiler: this.compilerInfo(),
-        main: fn
-      };
-      let programs = this.context.programs;
-      for (i = 0, l = programs.length; i < l; i++) {
-        if (programs[i]) {
-          ret[i] = programs[i];
-        }
-      }
-
-      if (this.environment.usePartial) {
-        ret.usePartial = true;
-      }
-      if (this.options.data) {
-        ret.useData = true;
-      }
-      if (this.useDepths) {
-        ret.useDepths = true;
-      }
-      if (this.useBlockParams) {
-        ret.useBlockParams = true;
-      }
-      if (this.options.compat) {
-        ret.compat = true;
-      }
-
-      if (!asObject) {
-        ret.compiler = JSON.stringify(ret.compiler);
-
-        this.source.currentLocation = {start: {line: 1, column: 0}};
-        ret = this.objectLiteral(ret);
-
-        if (options.srcName) {
-          ret = ret.toStringWithSourceMap({file: options.destName});
-          ret.map = ret.map && ret.map.toString();
-        } else {
-          ret = ret.toString();
-        }
-      } else {
-        ret.compilerOptions = this.options;
-      }
-
-      return ret;
-    } else {
-      return fn;
-    }
-  },
-
-  preamble: function() {
-    // track the last context pushed into place to allow skipping the
-    // getContext opcode when it would be a noop
-    this.lastContext = 0;
-    this.source = new CodeGen(this.options.srcName);
-  },
-
-  createFunctionContext: function(asObject) {
-    let varDeclarations = '';
-
-    let locals = this.stackVars.concat(this.registers.list);
-    if (locals.length > 0) {
-      varDeclarations += ', ' + locals.join(', ');
-    }
-
-    // Generate minimizer alias mappings
-    //
-    // When using true SourceNodes, this will update all references to the given alias
-    // as the source nodes are reused in situ. For the non-source node compilation mode,
-    // aliases will not be used, but this case is already being run on the client and
-    // we aren't concern about minimizing the template size.
-    let aliasCount = 0;
-    for (let alias in this.aliases) {    // eslint-disable-line guard-for-in
-      let node = this.aliases[alias];
-
-      if (this.aliases.hasOwnProperty(alias) && node.children && node.referenceCount > 1) {
-        varDeclarations += ', alias' + (++aliasCount) + '=' + alias;
-        node.children[0] = 'alias' + aliasCount;
-      }
-    }
-
-    let params = ['depth0', 'helpers', 'partials', 'data'];
-
-    if (this.useBlockParams || this.useDepths) {
-      params.push('blockParams');
-    }
-    if (this.useDepths) {
-      params.push('depths');
-    }
-
-    // Perform a second pass over the output to merge content when possible
-    let source = this.mergeSource(varDeclarations);
-
-    if (asObject) {
-      params.push(source);
-
-      return Function.apply(this, params);
-    } else {
-      return this.source.wrap(['function(', params.join(','), ') {\n  ', source, '}']);
-    }
-  },
-  mergeSource: function(varDeclarations) {
-    let isSimple = this.environment.isSimple,
-        appendOnly = !this.forceBuffer,
-        appendFirst,
-
-        sourceSeen,
-        bufferStart,
-        bufferEnd;
-    this.source.each((line) => {
-      if (line.appendToBuffer) {
-        if (bufferStart) {
-          line.prepend('  + ');
-        } else {
-          bufferStart = line;
-        }
-        bufferEnd = line;
-      } else {
-        if (bufferStart) {
-          if (!sourceSeen) {
-            appendFirst = true;
-          } else {
-            bufferStart.prepend('buffer += ');
-          }
-          bufferEnd.add(';');
-          bufferStart = bufferEnd = undefined;
-        }
-
-        sourceSeen = true;
-        if (!isSimple) {
-          appendOnly = false;
-        }
-      }
-    });
-
-
-    if (appendOnly) {
-      if (bufferStart) {
-        bufferStart.prepend('return ');
-        bufferEnd.add(';');
-      } else if (!sourceSeen) {
-        this.source.push('return "";');
-      }
-    } else {
-      varDeclarations += ', buffer = ' + (appendFirst ? '' : this.initializeBuffer());
-
-      if (bufferStart) {
-        bufferStart.prepend('return buffer + ');
-        bufferEnd.add(';');
-      } else {
-        this.source.push('return buffer;');
-      }
-    }
-
-    if (varDeclarations) {
-      this.source.prepend('var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n'));
-    }
-
-    return this.source.merge();
-  },
-
-  // [blockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // On stack, after: return value of blockHelperMissing
-  //
-  // The purpose of this opcode is to take a block of the form
-  // `{{#this.foo}}...{{/this.foo}}`, resolve the value of `foo`, and
-  // replace it on the stack with the result of properly
-  // invoking blockHelperMissing.
-  blockValue: function(name) {
-    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
-        params = [this.contextName(0)];
-    this.setupHelperArgs(name, 0, params);
-
-    let blockName = this.popStack();
-    params.splice(1, 0, blockName);
-
-    this.push(this.source.functionCall(blockHelperMissing, 'call', params));
-  },
-
-  // [ambiguousBlockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // Compiler value, before: lastHelper=value of last found helper, if any
-  // On stack, after, if no lastHelper: same as [blockValue]
-  // On stack, after, if lastHelper: value
-  ambiguousBlockValue: function() {
-    // We're being a bit cheeky and reusing the options value from the prior exec
-    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
-        params = [this.contextName(0)];
-    this.setupHelperArgs('', 0, params, true);
-
-    this.flushInline();
-
-    let current = this.topStack();
-    params.splice(1, 0, current);
-
-    this.pushSource([
-        'if (!', this.lastHelper, ') { ',
-          current, ' = ', this.source.functionCall(blockHelperMissing, 'call', params),
-        '}']);
-  },
-
-  // [appendContent]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  //
-  // Appends the string value of `content` to the current buffer
-  appendContent: function(content) {
-    if (this.pendingContent) {
-      content = this.pendingContent + content;
-    } else {
-      this.pendingLocation = this.source.currentLocation;
-    }
-
-    this.pendingContent = content;
-  },
-
-  // [append]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Coerces `value` to a String and appends it to the current buffer.
-  //
-  // If `value` is truthy, or 0, it is coerced into a string and appended
-  // Otherwise, the empty string is appended
-  append: function() {
-    if (this.isInline()) {
-      this.replaceStack((current) => [' != null ? ', current, ' : ""']);
-
-      this.pushSource(this.appendToBuffer(this.popStack()));
-    } else {
-      let local = this.popStack();
-      this.pushSource(['if (', local, ' != null) { ', this.appendToBuffer(local, undefined, true), ' }']);
-      if (this.environment.isSimple) {
-        this.pushSource(['else { ', this.appendToBuffer("''", undefined, true), ' }']);
-      }
-    }
-  },
-
-  // [appendEscaped]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Escape `value` and append it to the buffer
-  appendEscaped: function() {
-    this.pushSource(this.appendToBuffer(
-        [this.aliasable('this.escapeExpression'), '(', this.popStack(), ')']));
-  },
-
-  // [getContext]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  // Compiler value, after: lastContext=depth
-  //
-  // Set the value of the `lastContext` compiler value to the depth
-  getContext: function(depth) {
-    this.lastContext = depth;
-  },
-
-  // [pushContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext, ...
-  //
-  // Pushes the value of the current context onto the stack.
-  pushContext: function() {
-    this.pushStackLiteral(this.contextName(this.lastContext));
-  },
-
-  // [lookupOnContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext[name], ...
-  //
-  // Looks up the value of `name` on the current context and pushes
-  // it onto the stack.
-  lookupOnContext: function(parts, falsy, scoped) {
-    let i = 0;
-
-    if (!scoped && this.options.compat && !this.lastContext) {
-      // The depthed query is expected to handle the undefined logic for the root level that
-      // is implemented below, so we evaluate that directly in compat mode
-      this.push(this.depthedLookup(parts[i++]));
-    } else {
-      this.pushContext();
-    }
-
-    this.resolvePath('context', parts, i, falsy);
-  },
-
-  // [lookupBlockParam]
-  //
-  // On stack, before: ...
-  // On stack, after: blockParam[name], ...
-  //
-  // Looks up the value of `parts` on the given block param and pushes
-  // it onto the stack.
-  lookupBlockParam: function(blockParamId, parts) {
-    this.useBlockParams = true;
-
-    this.push(['blockParams[', blockParamId[0], '][', blockParamId[1], ']']);
-    this.resolvePath('context', parts, 1);
-  },
-
-  // [lookupData]
-  //
-  // On stack, before: ...
-  // On stack, after: data, ...
-  //
-  // Push the data lookup operator
-  lookupData: function(depth, parts) {
-    if (!depth) {
-      this.pushStackLiteral('data');
-    } else {
-      this.pushStackLiteral('this.data(data, ' + depth + ')');
-    }
-
-    this.resolvePath('data', parts, 0, true);
-  },
-
-  resolvePath: function(type, parts, i, falsy) {
-    if (this.options.strict || this.options.assumeObjects) {
-      this.push(strictLookup(this.options.strict, this, parts, type));
-      return;
-    }
-
-    let len = parts.length;
-    for (; i < len; i++) {
-      /*eslint-disable no-loop-func */
-      this.replaceStack((current) => {
-        let lookup = this.nameLookup(current, parts[i], type);
-        // We want to ensure that zero and false are handled properly if the context (falsy flag)
-        // needs to have the special handling for these values.
-        if (!falsy) {
-          return [' != null ? ', lookup, ' : ', current];
-        } else {
-          // Otherwise we can use generic falsy handling
-          return [' && ', lookup];
-        }
-      });
-      /*eslint-enable no-loop-func */
-    }
-  },
-
-  // [resolvePossibleLambda]
-  //
-  // On stack, before: value, ...
-  // On stack, after: resolved value, ...
-  //
-  // If the `value` is a lambda, replace it on the stack by
-  // the return value of the lambda
-  resolvePossibleLambda: function() {
-    this.push([this.aliasable('this.lambda'), '(', this.popStack(), ', ', this.contextName(0), ')']);
-  },
-
-  // [pushStringParam]
-  //
-  // On stack, before: ...
-  // On stack, after: string, currentContext, ...
-  //
-  // This opcode is designed for use in string mode, which
-  // provides the string value of a parameter along with its
-  // depth rather than resolving it immediately.
-  pushStringParam: function(string, type) {
-    this.pushContext();
-    this.pushString(type);
-
-    // If it's a subexpression, the string result
-    // will be pushed after this opcode.
-    if (type !== 'SubExpression') {
-      if (typeof string === 'string') {
-        this.pushString(string);
-      } else {
-        this.pushStackLiteral(string);
-      }
-    }
-  },
-
-  emptyHash: function(omitEmpty) {
-    if (this.trackIds) {
-      this.push('{}'); // hashIds
-    }
-    if (this.stringParams) {
-      this.push('{}'); // hashContexts
-      this.push('{}'); // hashTypes
-    }
-    this.pushStackLiteral(omitEmpty ? 'undefined' : '{}');
-  },
-  pushHash: function() {
-    if (this.hash) {
-      this.hashes.push(this.hash);
-    }
-    this.hash = {values: [], types: [], contexts: [], ids: []};
-  },
-  popHash: function() {
-    let hash = this.hash;
-    this.hash = this.hashes.pop();
-
-    if (this.trackIds) {
-      this.push(this.objectLiteral(hash.ids));
-    }
-    if (this.stringParams) {
-      this.push(this.objectLiteral(hash.contexts));
-      this.push(this.objectLiteral(hash.types));
-    }
-
-    this.push(this.objectLiteral(hash.values));
-  },
-
-  // [pushString]
-  //
-  // On stack, before: ...
-  // On stack, after: quotedString(string), ...
-  //
-  // Push a quoted version of `string` onto the stack
-  pushString: function(string) {
-    this.pushStackLiteral(this.quotedString(string));
-  },
-
-  // [pushLiteral]
-  //
-  // On stack, before: ...
-  // On stack, after: value, ...
-  //
-  // Pushes a value onto the stack. This operation prevents
-  // the compiler from creating a temporary variable to hold
-  // it.
-  pushLiteral: function(value) {
-    this.pushStackLiteral(value);
-  },
-
-  // [pushProgram]
-  //
-  // On stack, before: ...
-  // On stack, after: program(guid), ...
-  //
-  // Push a program expression onto the stack. This takes
-  // a compile-time guid and converts it into a runtime-accessible
-  // expression.
-  pushProgram: function(guid) {
-    if (guid != null) {
-      this.pushStackLiteral(this.programExpression(guid));
-    } else {
-      this.pushStackLiteral(null);
-    }
-  },
-
-  // [invokeHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // Pops off the helper's parameters, invokes the helper,
-  // and pushes the helper's return value onto the stack.
-  //
-  // If the helper is not found, `helperMissing` is called.
-  invokeHelper: function(paramSize, name, isSimple) {
-    let nonHelper = this.popStack(),
-        helper = this.setupHelper(paramSize, name),
-        simple = isSimple ? [helper.name, ' || '] : '';
-
-    let lookup = ['('].concat(simple, nonHelper);
-    if (!this.options.strict) {
-      lookup.push(' || ', this.aliasable('helpers.helperMissing'));
-    }
-    lookup.push(')');
-
-    this.push(this.source.functionCall(lookup, 'call', helper.callParams));
-  },
-
-  // [invokeKnownHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // This operation is used when the helper is known to exist,
-  // so a `helperMissing` fallback is not required.
-  invokeKnownHelper: function(paramSize, name) {
-    let helper = this.setupHelper(paramSize, name);
-    this.push(this.source.functionCall(helper.name, 'call', helper.callParams));
-  },
-
-  // [invokeAmbiguous]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of disambiguation
-  //
-  // This operation is used when an expression like `{{foo}}`
-  // is provided, but we don't know at compile-time whether it
-  // is a helper or a path.
-  //
-  // This operation emits more code than the other options,
-  // and can be avoided by passing the `knownHelpers` and
-  // `knownHelpersOnly` flags at compile-time.
-  invokeAmbiguous: function(name, helperCall) {
-    this.useRegister('helper');
-
-    let nonHelper = this.popStack();
-
-    this.emptyHash();
-    let helper = this.setupHelper(0, name, helperCall);
-
-    let helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-    let lookup = ['(', '(helper = ', helperName, ' || ', nonHelper, ')'];
-    if (!this.options.strict) {
-      lookup[0] = '(helper = ';
-      lookup.push(
-        ' != null ? helper : ',
-        this.aliasable('helpers.helperMissing')
-      );
-    }
-
-    this.push([
-        '(', lookup,
-        (helper.paramsInit ? ['),(', helper.paramsInit] : []), '),',
-        '(typeof helper === ', this.aliasable('"function"'), ' ? ',
-        this.source.functionCall('helper', 'call', helper.callParams), ' : helper))'
-    ]);
-  },
-
-  // [invokePartial]
-  //
-  // On stack, before: context, ...
-  // On stack after: result of partial invocation
-  //
-  // This operation pops off a context, invokes a partial with that context,
-  // and pushes the result of the invocation back.
-  invokePartial: function(isDynamic, name, indent) {
-    let params = [],
-        options = this.setupParams(name, 1, params, false);
-
-    if (isDynamic) {
-      name = this.popStack();
-      delete options.name;
-    }
-
-    if (indent) {
-      options.indent = JSON.stringify(indent);
-    }
-    options.helpers = 'helpers';
-    options.partials = 'partials';
-
-    if (!isDynamic) {
-      params.unshift(this.nameLookup('partials', name, 'partial'));
-    } else {
-      params.unshift(name);
-    }
-
-    if (this.options.compat) {
-      options.depths = 'depths';
-    }
-    options = this.objectLiteral(options);
-    params.push(options);
-
-    this.push(this.source.functionCall('this.invokePartial', '', params));
-  },
-
-  // [assignToHash]
-  //
-  // On stack, before: value, ..., hash, ...
-  // On stack, after: ..., hash, ...
-  //
-  // Pops a value off the stack and assigns it to the current hash
-  assignToHash: function(key) {
-    let value = this.popStack(),
-        context,
-        type,
-        id;
-
-    if (this.trackIds) {
-      id = this.popStack();
-    }
-    if (this.stringParams) {
-      type = this.popStack();
-      context = this.popStack();
-    }
-
-    let hash = this.hash;
-    if (context) {
-      hash.contexts[key] = context;
-    }
-    if (type) {
-      hash.types[key] = type;
-    }
-    if (id) {
-      hash.ids[key] = id;
-    }
-    hash.values[key] = value;
-  },
-
-  pushId: function(type, name, child) {
-    if (type === 'BlockParam') {
-      this.pushStackLiteral(
-          'blockParams[' + name[0] + '].path[' + name[1] + ']'
-          + (child ? ' + ' + JSON.stringify('.' + child) : ''));
-    } else if (type === 'PathExpression') {
-      this.pushString(name);
-    } else if (type === 'SubExpression') {
-      this.pushStackLiteral('true');
-    } else {
-      this.pushStackLiteral('null');
-    }
-  },
-
-  // HELPERS
-
-  compiler: JavaScriptCompiler,
-
-  compileChildren: function(environment, options) {
-    let children = environment.children, child, compiler;
-
-    for (let i = 0, l = children.length; i < l; i++) {
-      child = children[i];
-      compiler = new this.compiler();    // eslint-disable-line new-cap
-
-      let index = this.matchExistingProgram(child);
-
-      if (index == null) {
-        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-        index = this.context.programs.length;
-        child.index = index;
-        child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
-        this.context.environments[index] = child;
-
-        this.useDepths = this.useDepths || compiler.useDepths;
-        this.useBlockParams = this.useBlockParams || compiler.useBlockParams;
-      } else {
-        child.index = index;
-        child.name = 'program' + index;
-
-        this.useDepths = this.useDepths || child.useDepths;
-        this.useBlockParams = this.useBlockParams || child.useBlockParams;
-      }
-    }
-  },
-  matchExistingProgram: function(child) {
-    for (let i = 0, len = this.context.environments.length; i < len; i++) {
-      let environment = this.context.environments[i];
-      if (environment && environment.equals(child)) {
-        return i;
-      }
-    }
-  },
-
-  programExpression: function(guid) {
-    let child = this.environment.children[guid],
-        programParams = [child.index, 'data', child.blockParams];
-
-    if (this.useBlockParams || this.useDepths) {
-      programParams.push('blockParams');
-    }
-    if (this.useDepths) {
-      programParams.push('depths');
-    }
-
-    return 'this.program(' + programParams.join(', ') + ')';
-  },
-
-  useRegister: function(name) {
-    if (!this.registers[name]) {
-      this.registers[name] = true;
-      this.registers.list.push(name);
-    }
-  },
-
-  push: function(expr) {
-    if (!(expr instanceof Literal)) {
-      expr = this.source.wrap(expr);
-    }
-
-    this.inlineStack.push(expr);
-    return expr;
-  },
-
-  pushStackLiteral: function(item) {
-    this.push(new Literal(item));
-  },
-
-  pushSource: function(source) {
-    if (this.pendingContent) {
-      this.source.push(
-          this.appendToBuffer(this.source.quotedString(this.pendingContent), this.pendingLocation));
-      this.pendingContent = undefined;
-    }
-
-    if (source) {
-      this.source.push(source);
-    }
-  },
-
-  replaceStack: function(callback) {
-    let prefix = ['('],
-        stack,
-        createdStack,
-        usedLiteral;
-
-    /* istanbul ignore next */
-    if (!this.isInline()) {
-      throw new Exception('replaceStack on non-inline');
-    }
-
-    // We want to merge the inline statement into the replacement statement via ','
-    let top = this.popStack(true);
-
-    if (top instanceof Literal) {
-      // Literals do not need to be inlined
-      stack = [top.value];
-      prefix = ['(', stack];
-      usedLiteral = true;
-    } else {
-      // Get or create the current stack name for use by the inline
-      createdStack = true;
-      let name = this.incrStack();
-
-      prefix = ['((', this.push(name), ' = ', top, ')'];
-      stack = this.topStack();
-    }
-
-    let item = callback.call(this, stack);
-
-    if (!usedLiteral) {
-      this.popStack();
-    }
-    if (createdStack) {
-      this.stackSlot--;
-    }
-    this.push(prefix.concat(item, ')'));
-  },
-
-  incrStack: function() {
-    this.stackSlot++;
-    if (this.stackSlot > this.stackVars.length) { this.stackVars.push('stack' + this.stackSlot); }
-    return this.topStackName();
-  },
-  topStackName: function() {
-    return 'stack' + this.stackSlot;
-  },
-  flushInline: function() {
-    let inlineStack = this.inlineStack;
-    this.inlineStack = [];
-    for (let i = 0, len = inlineStack.length; i < len; i++) {
-      let entry = inlineStack[i];
-      /* istanbul ignore if */
-      if (entry instanceof Literal) {
-        this.compileStack.push(entry);
-      } else {
-        let stack = this.incrStack();
-        this.pushSource([stack, ' = ', entry, ';']);
-        this.compileStack.push(stack);
-      }
-    }
-  },
-  isInline: function() {
-    return this.inlineStack.length;
-  },
-
-  popStack: function(wrapped) {
-    let inline = this.isInline(),
-        item = (inline ? this.inlineStack : this.compileStack).pop();
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      if (!inline) {
-        /* istanbul ignore next */
-        if (!this.stackSlot) {
-          throw new Exception('Invalid stack pop');
-        }
-        this.stackSlot--;
-      }
-      return item;
-    }
-  },
-
-  topStack: function() {
-    let stack = (this.isInline() ? this.inlineStack : this.compileStack),
-        item = stack[stack.length - 1];
-
-    /* istanbul ignore if */
-    if (item instanceof Literal) {
-      return item.value;
-    } else {
-      return item;
-    }
-  },
-
-  contextName: function(context) {
-    if (this.useDepths && context) {
-      return 'depths[' + context + ']';
-    } else {
-      return 'depth' + context;
-    }
-  },
-
-  quotedString: function(str) {
-    return this.source.quotedString(str);
-  },
-
-  objectLiteral: function(obj) {
-    return this.source.objectLiteral(obj);
-  },
-
-  aliasable: function(name) {
-    let ret = this.aliases[name];
-    if (ret) {
-      ret.referenceCount++;
-      return ret;
-    }
-
-    ret = this.aliases[name] = this.source.wrap(name);
-    ret.aliasable = true;
-    ret.referenceCount = 1;
-
-    return ret;
-  },
-
-  setupHelper: function(paramSize, name, blockHelper) {
-    let params = [],
-        paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
-    let foundHelper = this.nameLookup('helpers', name, 'helper');
-
-    return {
-      params: params,
-      paramsInit: paramsInit,
-      name: foundHelper,
-      callParams: [this.contextName(0)].concat(params)
-    };
-  },
-
-  setupParams: function(helper, paramSize, params) {
-    let options = {}, contexts = [], types = [], ids = [], param;
-
-    options.name = this.quotedString(helper);
-    options.hash = this.popStack();
-
-    if (this.trackIds) {
-      options.hashIds = this.popStack();
-    }
-    if (this.stringParams) {
-      options.hashTypes = this.popStack();
-      options.hashContexts = this.popStack();
-    }
-
-    let inverse = this.popStack(),
-        program = this.popStack();
-
-    // Avoid setting fn and inverse if neither are set. This allows
-    // helpers to do a check for `if (options.fn)`
-    if (program || inverse) {
-      options.fn = program || 'this.noop';
-      options.inverse = inverse || 'this.noop';
-    }
-
-    // The parameters go on to the stack in order (making sure that they are evaluated in order)
-    // so we need to pop them off the stack in reverse order
-    let i = paramSize;
-    while (i--) {
-      param = this.popStack();
-      params[i] = param;
-
-      if (this.trackIds) {
-        ids[i] = this.popStack();
-      }
-      if (this.stringParams) {
-        types[i] = this.popStack();
-        contexts[i] = this.popStack();
-      }
-    }
-
-    if (this.trackIds) {
-      options.ids = this.source.generateArray(ids);
-    }
-    if (this.stringParams) {
-      options.types = this.source.generateArray(types);
-      options.contexts = this.source.generateArray(contexts);
-    }
-
-    if (this.options.data) {
-      options.data = 'data';
-    }
-    if (this.useBlockParams) {
-      options.blockParams = 'blockParams';
-    }
-    return options;
-  },
-
-  setupHelperArgs: function(helper, paramSize, params, useRegister) {
-    let options = this.setupParams(helper, paramSize, params, true);
-    options = this.objectLiteral(options);
-    if (useRegister) {
-      this.useRegister('options');
-      params.push('options');
-      return ['options=', options];
-    } else {
-      params.push(options);
-      return '';
-    }
-  }
-};
-
-
-(function() {
-  const reservedWords = (
-    'break else new var' +
-    ' case finally return void' +
-    ' catch for switch while' +
-    ' continue function this with' +
-    ' default if throw' +
-    ' delete in try' +
-    ' do instanceof typeof' +
-    ' abstract enum int short' +
-    ' boolean export interface static' +
-    ' byte extends long super' +
-    ' char final native synchronized' +
-    ' class float package throws' +
-    ' const goto private transient' +
-    ' debugger implements protected volatile' +
-    ' double import public let yield await' +
-    ' null true false'
-  ).split(' ');
-
-  const compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-  for (let i = 0, l = reservedWords.length; i < l; i++) {
-    compilerWords[reservedWords[i]] = true;
-  }
-}());
-
-JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  return !JavaScriptCompiler.RESERVED_WORDS[name] && (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/).test(name);
-};
-
-function strictLookup(requireTerminal, compiler, parts, type) {
-  let stack = compiler.popStack(),
-      i = 0,
-      len = parts.length;
-  if (requireTerminal) {
-    len--;
-  }
-
-  for (; i < len; i++) {
-    stack = compiler.nameLookup(stack, parts[i], type);
-  }
-
-  if (requireTerminal) {
-    return [compiler.aliasable('this.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ')'];
-  } else {
-    return stack;
-  }
-}
-
-export default JavaScriptCompiler;
diff --git a/lib/handlebars/lib/handlebars/compiler/printer.js b/lib/handlebars/lib/handlebars/compiler/printer.js
deleted file mode 100644
index 691a3567c..000000000
--- a/lib/handlebars/lib/handlebars/compiler/printer.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*eslint-disable new-cap */
-import Visitor from './visitor';
-
-export function print(ast) {
-  return new PrintVisitor().accept(ast);
-}
-
-export function PrintVisitor() {
-  this.padding = 0;
-}
-
-PrintVisitor.prototype = new Visitor();
-
-PrintVisitor.prototype.pad = function(string) {
-  let out = '';
-
-  for (let i = 0, l = this.padding; i < l; i++) {
-    out = out + '  ';
-  }
-
-  out = out + string + '\n';
-  return out;
-};
-
-PrintVisitor.prototype.Program = function(program) {
-  let out = '',
-      body = program.body,
-      i, l;
-
-  if (program.blockParams) {
-    let blockParams = 'BLOCK PARAMS: [';
-    for (i = 0, l = program.blockParams.length; i < l; i++) {
-       blockParams += ' ' + program.blockParams[i];
-    }
-    blockParams += ' ]';
-    out += this.pad(blockParams);
-  }
-
-  for (i = 0, l = body.length; i < l; i++) {
-    out = out + this.accept(body[i]);
-  }
-
-  this.padding--;
-
-  return out;
-};
-
-PrintVisitor.prototype.MustacheStatement = function(mustache) {
-  return this.pad('{{ ' + this.SubExpression(mustache) + ' }}');
-};
-
-PrintVisitor.prototype.BlockStatement = function(block) {
-  let out = '';
-
-  out = out + this.pad('BLOCK:');
-  this.padding++;
-  out = out + this.pad(this.SubExpression(block));
-  if (block.program) {
-    out = out + this.pad('PROGRAM:');
-    this.padding++;
-    out = out + this.accept(block.program);
-    this.padding--;
-  }
-  if (block.inverse) {
-    if (block.program) { this.padding++; }
-    out = out + this.pad('{{^}}');
-    this.padding++;
-    out = out + this.accept(block.inverse);
-    this.padding--;
-    if (block.program) { this.padding--; }
-  }
-  this.padding--;
-
-  return out;
-};
-
-PrintVisitor.prototype.PartialStatement = function(partial) {
-  let content = 'PARTIAL:' + partial.name.original;
-  if (partial.params[0]) {
-    content += ' ' + this.accept(partial.params[0]);
-  }
-  if (partial.hash) {
-    content += ' ' + this.accept(partial.hash);
-  }
-  return this.pad('{{> ' + content + ' }}');
-};
-
-PrintVisitor.prototype.ContentStatement = function(content) {
-  return this.pad("CONTENT[ '" + content.value + "' ]");
-};
-
-PrintVisitor.prototype.CommentStatement = function(comment) {
-  return this.pad("{{! '" + comment.value + "' }}");
-};
-
-PrintVisitor.prototype.SubExpression = function(sexpr) {
-  let params = sexpr.params,
-      paramStrings = [],
-      hash;
-
-  for (let i = 0, l = params.length; i < l; i++) {
-    paramStrings.push(this.accept(params[i]));
-  }
-
-  params = '[' + paramStrings.join(', ') + ']';
-
-  hash = sexpr.hash ? ' ' + this.accept(sexpr.hash) : '';
-
-  return this.accept(sexpr.path) + ' ' + params + hash;
-};
-
-PrintVisitor.prototype.PathExpression = function(id) {
-  let path = id.parts.join('/');
-  return (id.data ? '@' : '') + 'PATH:' + path;
-};
-
-
-PrintVisitor.prototype.StringLiteral = function(string) {
-  return '"' + string.value + '"';
-};
-
-PrintVisitor.prototype.NumberLiteral = function(number) {
-  return 'NUMBER{' + number.value + '}';
-};
-
-PrintVisitor.prototype.BooleanLiteral = function(bool) {
-  return 'BOOLEAN{' + bool.value + '}';
-};
-
-PrintVisitor.prototype.UndefinedLiteral = function() {
-  return 'UNDEFINED';
-};
-
-PrintVisitor.prototype.NullLiteral = function() {
-  return 'NULL';
-};
-
-PrintVisitor.prototype.Hash = function(hash) {
-  let pairs = hash.pairs,
-      joinedPairs = [];
-
-  for (let i = 0, l = pairs.length; i < l; i++) {
-    joinedPairs.push(this.accept(pairs[i]));
-  }
-
-  return 'HASH{' + joinedPairs.join(', ') + '}';
-};
-PrintVisitor.prototype.HashPair = function(pair) {
-  return pair.key + '=' + this.accept(pair.value);
-};
-/*eslint-enable new-cap */
diff --git a/lib/handlebars/lib/handlebars/compiler/visitor.js b/lib/handlebars/lib/handlebars/compiler/visitor.js
deleted file mode 100644
index ba7b3760c..000000000
--- a/lib/handlebars/lib/handlebars/compiler/visitor.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import Exception from '../exception';
-import AST from './ast';
-
-function Visitor() {
-  this.parents = [];
-}
-
-Visitor.prototype = {
-  constructor: Visitor,
-  mutating: false,
-
-  // Visits a given value. If mutating, will replace the value if necessary.
-  acceptKey: function(node, name) {
-    let value = this.accept(node[name]);
-    if (this.mutating) {
-      // Hacky sanity check:
-      if (value && (!value.type || !AST[value.type])) {
-        throw new Exception('Unexpected node type "' + value.type + '" found when accepting ' + name + ' on ' + node.type);
-      }
-      node[name] = value;
-    }
-  },
-
-  // Performs an accept operation with added sanity check to ensure
-  // required keys are not removed.
-  acceptRequired: function(node, name) {
-    this.acceptKey(node, name);
-
-    if (!node[name]) {
-      throw new Exception(node.type + ' requires ' + name);
-    }
-  },
-
-  // Traverses a given array. If mutating, empty respnses will be removed
-  // for child elements.
-  acceptArray: function(array) {
-    for (let i = 0, l = array.length; i < l; i++) {
-      this.acceptKey(array, i);
-
-      if (!array[i]) {
-        array.splice(i, 1);
-        i--;
-        l--;
-      }
-    }
-  },
-
-  accept: function(object) {
-    if (!object) {
-      return;
-    }
-
-    if (this.current) {
-      this.parents.unshift(this.current);
-    }
-    this.current = object;
-
-    let ret = this[object.type](object);
-
-    this.current = this.parents.shift();
-
-    if (!this.mutating || ret) {
-      return ret;
-    } else if (ret !== false) {
-      return object;
-    }
-  },
-
-  Program: function(program) {
-    this.acceptArray(program.body);
-  },
-
-  MustacheStatement: function(mustache) {
-    this.acceptRequired(mustache, 'path');
-    this.acceptArray(mustache.params);
-    this.acceptKey(mustache, 'hash');
-  },
-
-  BlockStatement: function(block) {
-    this.acceptRequired(block, 'path');
-    this.acceptArray(block.params);
-    this.acceptKey(block, 'hash');
-
-    this.acceptKey(block, 'program');
-    this.acceptKey(block, 'inverse');
-  },
-
-  PartialStatement: function(partial) {
-    this.acceptRequired(partial, 'name');
-    this.acceptArray(partial.params);
-    this.acceptKey(partial, 'hash');
-  },
-
-  ContentStatement: function(/* content */) {},
-  CommentStatement: function(/* comment */) {},
-
-  SubExpression: function(sexpr) {
-    this.acceptRequired(sexpr, 'path');
-    this.acceptArray(sexpr.params);
-    this.acceptKey(sexpr, 'hash');
-  },
-
-  PathExpression: function(/* path */) {},
-
-  StringLiteral: function(/* string */) {},
-  NumberLiteral: function(/* number */) {},
-  BooleanLiteral: function(/* bool */) {},
-  UndefinedLiteral: function(/* literal */) {},
-  NullLiteral: function(/* literal */) {},
-
-  Hash: function(hash) {
-    this.acceptArray(hash.pairs);
-  },
-  HashPair: function(pair) {
-    this.acceptRequired(pair, 'value');
-  }
-};
-
-export default Visitor;
diff --git a/lib/handlebars/lib/handlebars/compiler/whitespace-control.js b/lib/handlebars/lib/handlebars/compiler/whitespace-control.js
deleted file mode 100644
index 5b76944dc..000000000
--- a/lib/handlebars/lib/handlebars/compiler/whitespace-control.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import Visitor from './visitor';
-
-function WhitespaceControl() {
-}
-WhitespaceControl.prototype = new Visitor();
-
-WhitespaceControl.prototype.Program = function(program) {
-  let isRoot = !this.isRootSeen;
-  this.isRootSeen = true;
-
-  let body = program.body;
-  for (let i = 0, l = body.length; i < l; i++) {
-    let current = body[i],
-        strip = this.accept(current);
-
-    if (!strip) {
-      continue;
-    }
-
-    let _isPrevWhitespace = isPrevWhitespace(body, i, isRoot),
-        _isNextWhitespace = isNextWhitespace(body, i, isRoot),
-
-        openStandalone = strip.openStandalone && _isPrevWhitespace,
-        closeStandalone = strip.closeStandalone && _isNextWhitespace,
-        inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
-
-    if (strip.close) {
-      omitRight(body, i, true);
-    }
-    if (strip.open) {
-      omitLeft(body, i, true);
-    }
-
-    if (inlineStandalone) {
-      omitRight(body, i);
-
-      if (omitLeft(body, i)) {
-        // If we are on a standalone node, save the indent info for partials
-        if (current.type === 'PartialStatement') {
-          // Pull out the whitespace from the final line
-          current.indent = (/([ \t]+$)/).exec(body[i - 1].original)[1];
-        }
-      }
-    }
-    if (openStandalone) {
-      omitRight((current.program || current.inverse).body);
-
-      // Strip out the previous content node if it's whitespace only
-      omitLeft(body, i);
-    }
-    if (closeStandalone) {
-      // Always strip the next node
-      omitRight(body, i);
-
-      omitLeft((current.inverse || current.program).body);
-    }
-  }
-
-  return program;
-};
-WhitespaceControl.prototype.BlockStatement = function(block) {
-  this.accept(block.program);
-  this.accept(block.inverse);
-
-  // Find the inverse program that is involed with whitespace stripping.
-  let program = block.program || block.inverse,
-      inverse = block.program && block.inverse,
-      firstInverse = inverse,
-      lastInverse = inverse;
-
-  if (inverse && inverse.chained) {
-    firstInverse = inverse.body[0].program;
-
-    // Walk the inverse chain to find the last inverse that is actually in the chain.
-    while (lastInverse.chained) {
-      lastInverse = lastInverse.body[lastInverse.body.length - 1].program;
-    }
-  }
-
-  let strip = {
-    open: block.openStrip.open,
-    close: block.closeStrip.close,
-
-    // Determine the standalone candiacy. Basically flag our content as being possibly standalone
-    // so our parent can determine if we actually are standalone
-    openStandalone: isNextWhitespace(program.body),
-    closeStandalone: isPrevWhitespace((firstInverse || program).body)
-  };
-
-  if (block.openStrip.close) {
-    omitRight(program.body, null, true);
-  }
-
-  if (inverse) {
-    let inverseStrip = block.inverseStrip;
-
-    if (inverseStrip.open) {
-      omitLeft(program.body, null, true);
-    }
-
-    if (inverseStrip.close) {
-      omitRight(firstInverse.body, null, true);
-    }
-    if (block.closeStrip.open) {
-      omitLeft(lastInverse.body, null, true);
-    }
-
-    // Find standalone else statments
-    if (isPrevWhitespace(program.body)
-        && isNextWhitespace(firstInverse.body)) {
-      omitLeft(program.body);
-      omitRight(firstInverse.body);
-    }
-  } else if (block.closeStrip.open) {
-    omitLeft(program.body, null, true);
-  }
-
-  return strip;
-};
-
-WhitespaceControl.prototype.MustacheStatement = function(mustache) {
-  return mustache.strip;
-};
-
-WhitespaceControl.prototype.PartialStatement =
-    WhitespaceControl.prototype.CommentStatement = function(node) {
-  /* istanbul ignore next */
-  let strip = node.strip || {};
-  return {
-    inlineStandalone: true,
-    open: strip.open,
-    close: strip.close
-  };
-};
-
-
-function isPrevWhitespace(body, i, isRoot) {
-  if (i === undefined) {
-    i = body.length;
-  }
-
-  // Nodes that end with newlines are considered whitespace (but are special
-  // cased for strip operations)
-  let prev = body[i - 1],
-      sibling = body[i - 2];
-  if (!prev) {
-    return isRoot;
-  }
-
-  if (prev.type === 'ContentStatement') {
-    return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
-  }
-}
-function isNextWhitespace(body, i, isRoot) {
-  if (i === undefined) {
-    i = -1;
-  }
-
-  let next = body[i + 1],
-      sibling = body[i + 2];
-  if (!next) {
-    return isRoot;
-  }
-
-  if (next.type === 'ContentStatement') {
-    return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
-  }
-}
-
-// Marks the node to the right of the position as omitted.
-// I.e. {{foo}}' ' will mark the ' ' node as omitted.
-//
-// If i is undefined, then the first child will be marked as such.
-//
-// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-// content is met.
-function omitRight(body, i, multiple) {
-  let current = body[i == null ? 0 : i + 1];
-  if (!current || current.type !== 'ContentStatement' || (!multiple && current.rightStripped)) {
-    return;
-  }
-
-  let original = current.value;
-  current.value = current.value.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
-  current.rightStripped = current.value !== original;
-}
-
-// Marks the node to the left of the position as omitted.
-// I.e. ' '{{foo}} will mark the ' ' node as omitted.
-//
-// If i is undefined then the last child will be marked as such.
-//
-// If mulitple is truthy then all whitespace will be stripped out until non-whitespace
-// content is met.
-function omitLeft(body, i, multiple) {
-  let current = body[i == null ? body.length - 1 : i - 1];
-  if (!current || current.type !== 'ContentStatement' || (!multiple && current.leftStripped)) {
-    return;
-  }
-
-  // We omit the last node if it's whitespace only and not preceeded by a non-content node.
-  let original = current.value;
-  current.value = current.value.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
-  current.leftStripped = current.value !== original;
-  return current.leftStripped;
-}
-
-export default WhitespaceControl;
diff --git a/lib/handlebars/lib/handlebars/exception.js b/lib/handlebars/lib/handlebars/exception.js
deleted file mode 100644
index 46ce18eae..000000000
--- a/lib/handlebars/lib/handlebars/exception.js
+++ /dev/null
@@ -1,34 +0,0 @@
-
-const errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-function Exception(message, node) {
-  let loc = node && node.loc,
-      line,
-      column;
-  if (loc) {
-    line = loc.start.line;
-    column = loc.start.column;
-
-    message += ' - ' + line + ':' + column;
-  }
-
-  let tmp = Error.prototype.constructor.call(this, message);
-
-  // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-  for (let idx = 0; idx < errorProps.length; idx++) {
-    this[errorProps[idx]] = tmp[errorProps[idx]];
-  }
-
-  if (Error.captureStackTrace) {
-    Error.captureStackTrace(this, Exception);
-  }
-
-  if (loc) {
-    this.lineNumber = line;
-    this.column = column;
-  }
-}
-
-Exception.prototype = new Error();
-
-export default Exception;
diff --git a/lib/handlebars/lib/handlebars/no-conflict.js b/lib/handlebars/lib/handlebars/no-conflict.js
deleted file mode 100644
index a421f57e5..000000000
--- a/lib/handlebars/lib/handlebars/no-conflict.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*global window */
-export default function(Handlebars) {
-  /* istanbul ignore next */
-  let root = typeof global !== 'undefined' ? global : window,
-      $Handlebars = root.Handlebars;
-  /* istanbul ignore next */
-  Handlebars.noConflict = function() {
-    if (root.Handlebars === Handlebars) {
-      root.Handlebars = $Handlebars;
-    }
-  };
-}
diff --git a/lib/handlebars/lib/handlebars/runtime.js b/lib/handlebars/lib/handlebars/runtime.js
deleted file mode 100644
index 874728fb5..000000000
--- a/lib/handlebars/lib/handlebars/runtime.js
+++ /dev/null
@@ -1,214 +0,0 @@
-import * as Utils from './utils';
-import Exception from './exception';
-import { COMPILER_REVISION, REVISION_CHANGES, createFrame } from './base';
-
-export function checkRevision(compilerInfo) {
-  const compilerRevision = compilerInfo && compilerInfo[0] || 1,
-        currentRevision = COMPILER_REVISION;
-
-  if (compilerRevision !== currentRevision) {
-    if (compilerRevision < currentRevision) {
-      const runtimeVersions = REVISION_CHANGES[currentRevision],
-            compilerVersions = REVISION_CHANGES[compilerRevision];
-      throw new Exception('Template was precompiled with an older version of Handlebars than the current runtime. ' +
-            'Please update your precompiler to a newer version (' + runtimeVersions + ') or downgrade your runtime to an older version (' + compilerVersions + ').');
-    } else {
-      // Use the embedded version info since the runtime doesn't know about this revision yet
-      throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
-            'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
-    }
-  }
-}
-
-// TODO: Remove this line and break up compilePartial
-
-export function template(templateSpec, env) {
-  /* istanbul ignore next */
-  if (!env) {
-    throw new Exception('No environment passed to template');
-  }
-  if (!templateSpec || !templateSpec.main) {
-    throw new Exception('Unknown template object: ' + typeof templateSpec);
-  }
-
-  // Note: Using env.VM references rather than local var references throughout this section to allow
-  // for external users to override these as psuedo-supported APIs.
-  env.VM.checkRevision(templateSpec.compiler);
-
-  function invokePartialWrapper(partial, context, options) {
-    if (options.hash) {
-      context = Utils.extend({}, context, options.hash);
-    }
-
-    partial = env.VM.resolvePartial.call(this, partial, context, options);
-    let result = env.VM.invokePartial.call(this, partial, context, options);
-
-    if (result == null && env.compile) {
-      options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-      result = options.partials[options.name](context, options);
-    }
-    if (result != null) {
-      if (options.indent) {
-        let lines = result.split('\n');
-        for (let i = 0, l = lines.length; i < l; i++) {
-          if (!lines[i] && i + 1 === l) {
-            break;
-          }
-
-          lines[i] = options.indent + lines[i];
-        }
-        result = lines.join('\n');
-      }
-      return result;
-    } else {
-      throw new Exception('The partial ' + options.name + ' could not be compiled when running in runtime-only mode');
-    }
-  }
-
-  // Just add water
-  let container = {
-    strict: function(obj, name) {
-      if (!(name in obj)) {
-        throw new Exception('"' + name + '" not defined in ' + obj);
-      }
-      return obj[name];
-    },
-    lookup: function(depths, name) {
-      const len = depths.length;
-      for (let i = 0; i < len; i++) {
-        if (depths[i] && depths[i][name] != null) {
-          return depths[i][name];
-        }
-      }
-    },
-    lambda: function(current, context) {
-      return typeof current === 'function' ? current.call(context) : current;
-    },
-
-    escapeExpression: Utils.escapeExpression,
-    invokePartial: invokePartialWrapper,
-
-    fn: function(i) {
-      return templateSpec[i];
-    },
-
-    programs: [],
-    program: function(i, data, declaredBlockParams, blockParams, depths) {
-      let programWrapper = this.programs[i],
-          fn = this.fn(i);
-      if (data || depths || blockParams || declaredBlockParams) {
-        programWrapper = wrapProgram(this, i, fn, data, declaredBlockParams, blockParams, depths);
-      } else if (!programWrapper) {
-        programWrapper = this.programs[i] = wrapProgram(this, i, fn);
-      }
-      return programWrapper;
-    },
-
-    data: function(value, depth) {
-      while (value && depth--) {
-        value = value._parent;
-      }
-      return value;
-    },
-    merge: function(param, common) {
-      let obj = param || common;
-
-      if (param && common && (param !== common)) {
-        obj = Utils.extend({}, common, param);
-      }
-
-      return obj;
-    },
-
-    noop: env.VM.noop,
-    compilerInfo: templateSpec.compiler
-  };
-
-  function ret(context, options = {}) {
-    let data = options.data;
-
-    ret._setup(options);
-    if (!options.partial && templateSpec.useData) {
-      data = initData(context, data);
-    }
-    let depths,
-        blockParams = templateSpec.useBlockParams ? [] : undefined;
-    if (templateSpec.useDepths) {
-      depths = options.depths ? [context].concat(options.depths) : [context];
-    }
-
-    return templateSpec.main.call(container, context, container.helpers, container.partials, data, blockParams, depths);
-  }
-  ret.isTop = true;
-
-  ret._setup = function(options) {
-    if (!options.partial) {
-      container.helpers = container.merge(options.helpers, env.helpers);
-
-      if (templateSpec.usePartial) {
-        container.partials = container.merge(options.partials, env.partials);
-      }
-    } else {
-      container.helpers = options.helpers;
-      container.partials = options.partials;
-    }
-  };
-
-  ret._child = function(i, data, blockParams, depths) {
-    if (templateSpec.useBlockParams && !blockParams) {
-      throw new Exception('must pass block params');
-    }
-    if (templateSpec.useDepths && !depths) {
-      throw new Exception('must pass parent depths');
-    }
-
-    return wrapProgram(container, i, templateSpec[i], data, 0, blockParams, depths);
-  };
-  return ret;
-}
-
-export function wrapProgram(container, i, fn, data, declaredBlockParams, blockParams, depths) {
-  function prog(context, options = {}) {
-    return fn.call(container,
-        context,
-        container.helpers, container.partials,
-        options.data || data,
-        blockParams && [options.blockParams].concat(blockParams),
-        depths && [context].concat(depths));
-  }
-  prog.program = i;
-  prog.depth = depths ? depths.length : 0;
-  prog.blockParams = declaredBlockParams || 0;
-  return prog;
-}
-
-export function resolvePartial(partial, context, options) {
-  if (!partial) {
-    partial = options.partials[options.name];
-  } else if (!partial.call && !options.name) {
-    // This is a dynamic partial that returned a string
-    options.name = partial;
-    partial = options.partials[partial];
-  }
-  return partial;
-}
-
-export function invokePartial(partial, context, options) {
-  options.partial = true;
-
-  if (partial === undefined) {
-    throw new Exception('The partial ' + options.name + ' could not be found');
-  } else if (partial instanceof Function) {
-    return partial(context, options);
-  }
-}
-
-export function noop() { return ''; }
-
-function initData(context, data) {
-  if (!data || !('root' in data)) {
-    data = data ? createFrame(data) : {};
-    data.root = context;
-  }
-  return data;
-}
diff --git a/lib/handlebars/lib/handlebars/safe-string.js b/lib/handlebars/lib/handlebars/safe-string.js
deleted file mode 100644
index 468019421..000000000
--- a/lib/handlebars/lib/handlebars/safe-string.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Build out our basic SafeString type
-function SafeString(string) {
-  this.string = string;
-}
-
-SafeString.prototype.toString = SafeString.prototype.toHTML = function() {
-  return '' + this.string;
-};
-
-export default SafeString;
diff --git a/lib/handlebars/lib/handlebars/utils.js b/lib/handlebars/lib/handlebars/utils.js
deleted file mode 100644
index c5223947d..000000000
--- a/lib/handlebars/lib/handlebars/utils.js
+++ /dev/null
@@ -1,101 +0,0 @@
-const escape = {
-  '&': '&amp;',
-  '<': '&lt;',
-  '>': '&gt;',
-  '"': '&quot;',
-  "'": '&#x27;',
-  '`': '&#x60;'
-};
-
-const badChars = /[&<>"'`]/g,
-      possible = /[&<>"'`]/;
-
-function escapeChar(chr) {
-  return escape[chr];
-}
-
-export function extend(obj /* , ...source */) {
-  for (let i = 1; i < arguments.length; i++) {
-    for (let key in arguments[i]) {
-      if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
-        obj[key] = arguments[i][key];
-      }
-    }
-  }
-
-  return obj;
-}
-
-export let toString = Object.prototype.toString;
-
-// Sourced from lodash
-// https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
-/*eslint-disable func-style, no-var */
-var isFunction = function(value) {
-  return typeof value === 'function';
-};
-// fallback for older versions of Chrome and Safari
-/* istanbul ignore next */
-if (isFunction(/x/)) {
-  isFunction = function(value) {
-    return typeof value === 'function' && toString.call(value) === '[object Function]';
-  };
-}
-export var isFunction;
-/*eslint-enable func-style, no-var */
-
-/* istanbul ignore next */
-export const isArray = Array.isArray || function(value) {
-  return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
-};
-
-// Older IE versions do not directly support indexOf so we must implement our own, sadly.
-export function indexOf(array, value) {
-  for (let i = 0, len = array.length; i < len; i++) {
-    if (array[i] === value) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-
-export function escapeExpression(string) {
-  if (typeof string !== 'string') {
-    // don't escape SafeStrings, since they're already safe
-    if (string && string.toHTML) {
-      return string.toHTML();
-    } else if (string == null) {
-      return '';
-    } else if (!string) {
-      return string + '';
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = '' + string;
-  }
-
-  if (!possible.test(string)) { return string; }
-  return string.replace(badChars, escapeChar);
-}
-
-export function isEmpty(value) {
-  if (!value && value !== 0) {
-    return true;
-  } else if (isArray(value) && value.length === 0) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-export function blockParams(params, ids) {
-  params.path = ids;
-  return params;
-}
-
-export function appendContextPath(contextPath, id) {
-  return (contextPath ? contextPath + '.' : '') + id;
-}
diff --git a/lib/handlebars/lib/index.js b/lib/handlebars/lib/index.js
deleted file mode 100644
index 0383c02f7..000000000
--- a/lib/handlebars/lib/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// USAGE:
-// var handlebars = require('handlebars');
-/* eslint-disable no-var */
-
-// var local = handlebars.create();
-
-var handlebars = require('../dist/cjs/handlebars')['default'];
-
-var printer = require('../dist/cjs/handlebars/compiler/printer');
-handlebars.PrintVisitor = printer.PrintVisitor;
-handlebars.print = printer.print;
-
-module.exports = handlebars;
-
-// Publish a Node.js require() handler for .handlebars and .hbs files
-function extension(module, filename) {
-  var fs = require('fs');
-  var templateString = fs.readFileSync(filename, 'utf8');
-  module.exports = handlebars.compile(templateString);
-}
-/* istanbul ignore else */
-if (typeof require !== 'undefined' && require.extensions) {
-  require.extensions['.handlebars'] = extension;
-  require.extensions['.hbs'] = extension;
-}
diff --git a/lib/handlebars/lib/precompiler.js b/lib/handlebars/lib/precompiler.js
deleted file mode 100644
index 48cfebd1a..000000000
--- a/lib/handlebars/lib/precompiler.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/*eslint-disable no-console */
-import fs from 'fs';
-import * as Handlebars from './handlebars';
-import {basename} from 'path';
-import {SourceMapConsumer, SourceNode} from 'source-map';
-import uglify from 'uglify-js';
-
-module.exports.cli = function(opts) {
-  if (opts.version) {
-    console.log(Handlebars.VERSION);
-    return;
-  }
-
-  if (!opts.templates.length) {
-    throw new Handlebars.Exception('Must define at least one template or directory.');
-  }
-
-  opts.templates.forEach(function(template) {
-    try {
-      fs.statSync(template);
-    } catch (err) {
-      throw new Handlebars.Exception(`Unable to open template file "${template}"`);
-    }
-  });
-
-  if (opts.simple && opts.min) {
-    throw new Handlebars.Exception('Unable to minimize simple output');
-  }
-  if (opts.simple && (opts.templates.length !== 1 || fs.statSync(opts.templates[0]).isDirectory())) {
-    throw new Handlebars.Exception('Unable to output multiple templates in simple mode');
-  }
-
-  // Convert the known list into a hash
-  let known = {};
-  if (opts.known && !Array.isArray(opts.known)) {
-    opts.known = [opts.known];
-  }
-  if (opts.known) {
-    for (let i = 0, len = opts.known.length; i < len; i++) {
-      known[opts.known[i]] = true;
-    }
-  }
-
-  // Build file extension pattern
-  let extension = opts.extension.replace(/[\\^$*+?.():=!|{}\-\[\]]/g, function(arg) { return '\\' + arg; });
-  extension = new RegExp('\\.' + extension + '$');
-
-  let output = new SourceNode();
-  if (!opts.simple) {
-    if (opts.amd) {
-      output.add('define([\'' + opts.handlebarPath + 'handlebars.runtime\'], function(Handlebars) {\n  Handlebars = Handlebars["default"];');
-    } else if (opts.commonjs) {
-      output.add('var Handlebars = require("' + opts.commonjs + '");');
-    } else {
-      output.add('(function() {\n');
-    }
-    output.add('  var template = Handlebars.template, templates = ');
-    if (opts.namespace) {
-      output.add(opts.namespace);
-      output.add(' = ');
-      output.add(opts.namespace);
-      output.add(' || ');
-    }
-    output.add('{};\n');
-  }
-  function processTemplate(template, root) {
-    let path = template,
-        stat = fs.statSync(path);
-    if (stat.isDirectory()) {
-      fs.readdirSync(template).map(function(file) {
-        let childPath = template + '/' + file;
-
-        if (extension.test(childPath) || fs.statSync(childPath).isDirectory()) {
-          processTemplate(childPath, root || template);
-        }
-      });
-    } else {
-      let data = fs.readFileSync(path, 'utf8');
-
-      if (opts.bom && data.indexOf('\uFEFF') === 0) {
-        data = data.substring(1);
-      }
-
-      let options = {
-        knownHelpers: known,
-        knownHelpersOnly: opts.o
-      };
-
-      if (opts.map) {
-        options.srcName = path;
-      }
-      if (opts.data) {
-        options.data = true;
-      }
-
-      // Clean the template name
-      if (!root) {
-        template = basename(template);
-      } else if (template.indexOf(root) === 0) {
-        template = template.substring(root.length + 1);
-      }
-      template = template.replace(extension, '');
-
-      let precompiled = Handlebars.precompile(data, options);
-
-      // If we are generating a source map, we have to reconstruct the SourceNode object
-      if (opts.map) {
-        let consumer = new SourceMapConsumer(precompiled.map);
-        precompiled = SourceNode.fromStringWithSourceMap(precompiled.code, consumer);
-      }
-
-      if (opts.simple) {
-        output.add([precompiled, '\n']);
-      } else if (opts.partial) {
-        if (opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
-          output.add('return ');
-        }
-        output.add(['Handlebars.partials[\'', template, '\'] = template(', precompiled, ');\n']);
-      } else {
-        if (opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
-          output.add('return ');
-        }
-        output.add(['templates[\'', template, '\'] = template(', precompiled, ');\n']);
-      }
-    }
-  }
-
-  opts.templates.forEach(function(template) {
-    processTemplate(template, opts.root);
-  });
-
-  // Output the content
-  if (!opts.simple) {
-    if (opts.amd) {
-      if (opts.templates.length > 1 || (opts.templates.length == 1 && fs.statSync(opts.templates[0]).isDirectory())) {
-        if (opts.partial) {
-          output.add('return Handlebars.partials;\n');
-        } else {
-          output.add('return templates;\n');
-        }
-      }
-      output.add('});');
-    } else if (!opts.commonjs) {
-      output.add('})();');
-    }
-  }
-
-
-  if (opts.map) {
-    output.add('\n//# sourceMappingURL=' + opts.map + '\n');
-  }
-
-  output = output.toStringWithSourceMap();
-  output.map = output.map + '';
-
-  if (opts.min) {
-    output = uglify.minify(output.code, {
-      fromString: true,
-
-      outSourceMap: opts.map,
-      inSourceMap: JSON.parse(output.map)
-    });
-    if (opts.map) {
-      output.code += '\n//# sourceMappingURL=' + opts.map + '\n';
-    }
-  }
-
-  if (opts.map) {
-    fs.writeFileSync(opts.map, output.map, 'utf8');
-  }
-  output = output.code;
-
-  if (opts.output) {
-    fs.writeFileSync(opts.output, output, 'utf8');
-  } else {
-    console.log(output);
-  }
-};
diff --git a/lib/handlebars/package.json b/lib/handlebars/package.json
deleted file mode 100644
index 83f428d0f..000000000
--- a/lib/handlebars/package.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "handlebars",
-  "barename": "handlebars",
-  "version": "3.0.3",
-  "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
-  "homepage": "http://www.handlebarsjs.com/",
-  "keywords": [
-    "handlebars",
-    "mustache",
-    "template",
-    "html"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/wycats/handlebars.js.git"
-  },
-  "author": "Yehuda Katz",
-  "license": "MIT",
-  "readmeFilename": "README.md",
-  "engines": {
-    "node": ">=0.4.7"
-  },
-  "dependencies": {
-    "optimist": "^0.6.1",
-    "source-map": "^0.1.40"
-  },
-  "optionalDependencies": {
-    "uglify-js": "~2.3"
-  },
-  "devDependencies": {
-    "async": "^0.9.0",
-    "aws-sdk": "~1.5.0",
-    "babel-loader": "^5.0.0",
-    "babel-runtime": "^5.1.10",
-    "benchmark": "~1.0",
-    "dustjs-linkedin": "^2.0.2",
-    "eco": "~1.1.0-rc-3",
-    "grunt": "~0.4.1",
-    "grunt-babel": "^5.0.0",
-    "grunt-cli": "~0.1.10",
-    "grunt-contrib-clean": "0.x",
-    "grunt-contrib-concat": "0.x",
-    "grunt-contrib-connect": "0.x",
-    "grunt-contrib-copy": "0.x",
-    "grunt-contrib-requirejs": "0.x",
-    "grunt-contrib-uglify": "0.x",
-    "grunt-contrib-watch": "0.x",
-    "grunt-eslint": "^11.0.0",
-    "grunt-saucelabs": "8.x",
-    "grunt-webpack": "^1.0.8",
-    "istanbul": "^0.3.0",
-    "jison": "~0.3.0",
-    "keen.io": "0.0.3",
-    "mocha": "~1.20.0",
-    "mustache": "0.x",
-    "semver": "^4.0.0",
-    "underscore": "^1.5.1"
-  },
-  "main": "lib/index.js",
-  "bin": {
-    "handlebars": "bin/handlebars"
-  },
-  "scripts": {
-    "test": "grunt"
-  },
-  "jspm": {
-    "main": "handlebars",
-    "directories": {
-      "lib": "dist/amd"
-    },
-    "buildConfig": {
-      "minify": true
-    }
-  }
-}
diff --git a/lib/handlebars/release-notes.md b/lib/handlebars/release-notes.md
deleted file mode 100644
index 21a5346e9..000000000
--- a/lib/handlebars/release-notes.md
+++ /dev/null
@@ -1,378 +0,0 @@
-# Release Notes
-
-## Development
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.3...master)
-
-## v3.0.3 - April 28th, 2015
-- [#1004](https://github.com/wycats/handlebars.js/issues/1004) - Latest version breaks with RequireJS (global is undefined) ([@boskee](https://api.github.com/users/boskee))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.2...v3.0.3)
-
-## v3.0.2 - April 20th, 2015
-- [#998](https://github.com/wycats/handlebars.js/pull/998) - Add full support for es6 ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#994](https://github.com/wycats/handlebars.js/issues/994) - Access Handlebars.Visitor in browser ([@tamlyn](https://api.github.com/users/tamlyn))
-- [#990](https://github.com/wycats/handlebars.js/issues/990) - Allow passing null/undefined literals subexpressions ([@blimmer](https://api.github.com/users/blimmer))
-- [#989](https://github.com/wycats/handlebars.js/issues/989) - Source-map error with requirejs ([@SteppeEagle](https://api.github.com/users/SteppeEagle))
-- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property  ([@75lb](https://api.github.com/users/75lb))
-- Use captureStackTrace for error handler - a009a97
-- Ignore branches tested without coverage monitoring - 37a664b
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.1...v3.0.2)
-
-## v3.0.1 - March 24th, 2015
-- [#984](https://github.com/wycats/handlebars.js/pull/984) - Adding documentation for passing arguments into partials ([@johneke](https://api.github.com/users/johneke))
-- [#973](https://github.com/wycats/handlebars.js/issues/973) - version 3 is slower than version 2 ([@elover](https://api.github.com/users/elover))
-- [#966](https://github.com/wycats/handlebars.js/issues/966) - "handlebars --version" does not work with v3.0.0 ([@abloomston](https://api.github.com/users/abloomston))
-- [#964](https://github.com/wycats/handlebars.js/pull/964) - default is a reserved word ([@grassick](https://api.github.com/users/grassick))
-- [#962](https://github.com/wycats/handlebars.js/pull/962) - Add dashbars' link on README. ([@pismute](https://api.github.com/users/pismute))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.0...v3.0.1)
-
-## v3.0.0 - February 10th, 2015
-- [#941](https://github.com/wycats/handlebars.js/pull/941) - Add support for dynamic partial names ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#940](https://github.com/wycats/handlebars.js/pull/940) - Add missing reserved words so compiler knows to use array syntax: ([@mattflaschen](https://api.github.com/users/mattflaschen))
-- [#938](https://github.com/wycats/handlebars.js/pull/938) - Fix example using #with helper ([@diwo](https://api.github.com/users/diwo))
-- [#930](https://github.com/wycats/handlebars.js/pull/930) - Add parent tracking and mutation to AST visitors ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#926](https://github.com/wycats/handlebars.js/issues/926) - Depthed lookups fail when program duplicator runs ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#918](https://github.com/wycats/handlebars.js/pull/918) - Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos ([@oneeman](https://api.github.com/users/oneeman))
-- [#915](https://github.com/wycats/handlebars.js/pull/915) - Ast update ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#910](https://github.com/wycats/handlebars.js/issues/910) - Different behavior of {{@last}} when {{#each}} in {{#each}} ([@zordius](https://api.github.com/users/zordius))
-- [#907](https://github.com/wycats/handlebars.js/issues/907) - Implement named helper variable references ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#906](https://github.com/wycats/handlebars.js/pull/906) - Add parser support for block params ([@mmun](https://api.github.com/users/mmun))
-- [#903](https://github.com/wycats/handlebars.js/issues/903) - Only provide aliases for multiple use calls ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#902](https://github.com/wycats/handlebars.js/pull/902) - Generate Source Maps ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#901](https://github.com/wycats/handlebars.js/issues/901) - Still escapes with noEscape enabled on isolated Handlebars environment ([@zedknight](https://api.github.com/users/zedknight))
-- [#896](https://github.com/wycats/handlebars.js/pull/896) - Simplify BlockNode by removing intermediate MustacheNode ([@mmun](https://api.github.com/users/mmun))
-- [#892](https://github.com/wycats/handlebars.js/pull/892) - Implement parser for else chaining of helpers ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#889](https://github.com/wycats/handlebars.js/issues/889) - Consider extensible parser API ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#887](https://github.com/wycats/handlebars.js/issues/887) - Handlebars.noConflict() option? ([@bradvogel](https://api.github.com/users/bradvogel))
-- [#886](https://github.com/wycats/handlebars.js/issues/886) - Add SafeString to context (or use duck-typing) ([@dominicbarnes](https://api.github.com/users/dominicbarnes))
-- [#870](https://github.com/wycats/handlebars.js/pull/870) - Registering undefined partial throws exception. ([@max-b](https://api.github.com/users/max-b))
-- [#866](https://github.com/wycats/handlebars.js/issues/866) - comments don't respect whitespace control ([@75lb](https://api.github.com/users/75lb))
-- [#863](https://github.com/wycats/handlebars.js/pull/863) - + jsDelivr CDN info ([@tomByrer](https://api.github.com/users/tomByrer))
-- [#858](https://github.com/wycats/handlebars.js/issues/858) - Disable new default auto-indent at included partials ([@majodev](https://api.github.com/users/majodev))
-- [#856](https://github.com/wycats/handlebars.js/pull/856) - jspm compatibility ([@MajorBreakfast](https://api.github.com/users/MajorBreakfast))
-- [#805](https://github.com/wycats/handlebars.js/issues/805) - Request: "strict" lookups ([@nzakas](https://api.github.com/users/nzakas))
-
-- Export the default object for handlebars/runtime - 5594416
-- Lookup partials when undefined - 617dd57
-
-Compatibility notes:
-- Runtime breaking changes. Must match 3.x runtime and precompiler.
-- The AST has been upgraded to a public API.
-  - There are a number of changes to this, but the format is now documented in docs/compiler-api.md
-  - The Visitor API has been expanded to support mutation and provide a base implementation
-- The `JavaScriptCompiler` APIs have been formalized and documented. As part of the sourcemap handling these should be updated to return arrays for concatenation.
-- `JavaScriptCompiler.namespace` has been removed as it was unused.
-- `SafeString` is now duck typed on `toHTML`
-
-New Features:
-- noConflict
-- Source Maps
-- Block Params
-- Strict Mode
-- @last and other each changes
-- Chained else blocks
-- @data methods can now have helper parameters passed to them
-- Dynamic partials
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0...v3.0.0)
-
-## v2.0.0 - September 1st, 2014
-- Update jsfiddle to 2.0.0-beta.1 - 0670f65
-- Add contrib note regarding handlebarsjs.com docs - 4d17e3c
-- Play nice with gemspec version numbers - 64d5481
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-beta.1...v2.0.0)
-
-## v2.0.0-beta.1 - August 26th, 2014
-- [#787](https://github.com/wycats/handlebars.js/pull/787) - Remove whitespace surrounding standalone statements ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#827](https://github.com/wycats/handlebars.js/issues/827) - Render false literal as “false” ([@scoot557](https://api.github.com/users/scoot557))
-- [#767](https://github.com/wycats/handlebars.js/issues/767) - Subexpressions bug with hash and context ([@evensoul](https://api.github.com/users/evensoul))
-- Changes to 0/undefined handling
-  - [#731](https://github.com/wycats/handlebars.js/pull/731) - Strange behavior for {{#foo}} {{bar}} {{/foo}} when foo is 0 ([@kpdecker](https://api.github.com/users/kpdecker))
-  - [#820](https://github.com/wycats/handlebars.js/issues/820) - strange behavior for {{foo.bar}} when foo is 0 or null or false ([@zordius](https://api.github.com/users/zordius))
-  - [#837](https://github.com/wycats/handlebars.js/issues/837) - Strange input for custom helper ( foo.bar == false when foo is undefined ) ([@zordius](https://api.github.com/users/zordius))
-- [#819](https://github.com/wycats/handlebars.js/pull/819) - Implement recursive field lookup ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#764](https://github.com/wycats/handlebars.js/issues/764) - This reference not working for helpers ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#773](https://github.com/wycats/handlebars.js/issues/773) - Implicit parameters in {{#each}} introduces a peculiarity in helpers calling convention  ([@Bertrand](https://api.github.com/users/Bertrand))
-- [#783](https://github.com/wycats/handlebars.js/issues/783) - helperMissing and consistency for different expression types ([@ErisDS](https://api.github.com/users/ErisDS))
-- [#795](https://github.com/wycats/handlebars.js/pull/795) - Turn the precompile script into a wrapper around a module. ([@jwietelmann](https://api.github.com/users/jwietelmann))
-- [#823](https://github.com/wycats/handlebars.js/pull/823) - Support inverse sections on the with helper ([@dan-manges](https://api.github.com/users/dan-manges))
-- [#834](https://github.com/wycats/handlebars.js/pull/834) - Refactor blocks, programs and inverses ([@mmun](https://api.github.com/users/mmun))
-- [#852](https://github.com/wycats/handlebars.js/issues/852) - {{foo~}} space control behavior is different from older version ([@zordius](https://api.github.com/users/zordius))
-- [#835](https://github.com/wycats/handlebars.js/issues/835) - Templates overwritten if file is loaded twice
-
-- Expose escapeExpression on the root object - 980c38c
-- Remove nested function eval in blockHelperMissing - 6f22ec1
-- Fix compiler program de-duping - 9e3f824
-
-Compatibility notes:
-- The default build now outputs a generic UMD wrapper. This should be transparent change but may cause issues in some environments.
-- Runtime compatibility breaks in both directions. Ensure that both compiler and client are upgraded to 2.0.0-beta.1 or higher at the same time.
-  - `programWithDepth` has been removed an instead an array of context values is passed to fields needing depth lookups.
-- `false` values are now printed to output rather than silently dropped
-- Lines containing only block statements and whitespace are now removed. This matches the Mustache spec but may cause issues with code that expects whitespace to exist but would not otherwise.
-- Partials that are standalone will now indent their rendered content
-- `AST.ProgramNode`'s signature has changed. 
-- Numerious methods/features removed from psuedo-API classes
-  - `JavaScriptCompiler.register`
-  - `JavaScriptCompiler.replaceStack` no longer supports non-inline replace
-  - `Compiler.disassemble`
-  - `DECLARE` opcode
-  - `strip` opcode
-  - `lookup` opcode
-  - Content nodes may have their `string` values mutated over time. `original` field provides the unmodified value.
-- Removed unused `Handlebars.registerHelper` `inverse` parameter
-- `each` helper requires iterator parameter
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.4...v2.0.0-beta.1)
-
-## v2.0.0-alpha.4 - May 19th, 2014
-- Expose setup wrappers for compiled templates - 3638874
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.3...v2.0.0-alpha.4)
-
-## v2.0.0-alpha.3 - May 19th, 2014
-- [#797](https://github.com/wycats/handlebars.js/pull/797) - Pass full helper ID to helperMissing when options are provided ([@tomdale](https://api.github.com/users/tomdale))
-- [#793](https://github.com/wycats/handlebars.js/pull/793) - Ensure isHelper is coerced to a boolean ([@mmun](https://api.github.com/users/mmun))
-- Refactor template init logic - 085e5e1
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.2...v2.0.0-alpha.3)
-
-## v2.0.0-alpha.2 - March 6th, 2014
-- [#756](https://github.com/wycats/handlebars.js/pull/756) - fix bug in IE<=8 (no Array::map), closes #751 ([@jenseng](https://api.github.com/users/jenseng))
-- [#749](https://github.com/wycats/handlebars.js/pull/749) - properly handle multiple subexpressions in the same hash, fixes #748 ([@jenseng](https://api.github.com/users/jenseng))
-- [#743](https://github.com/wycats/handlebars.js/issues/743) - subexpression confusion/problem? ([@waynedpj](https://api.github.com/users/waynedpj))
-- [#746](https://github.com/wycats/handlebars.js/issues/746) - [CLI] support `handlebars --version` ([@apfelbox](https://api.github.com/users/apfelbox))
-- [#747](https://github.com/wycats/handlebars.js/pull/747) - updated grunt-saucelabs, failing tests revealed ([@Jonahss](https://api.github.com/users/Jonahss))
-- Make JSON a requirement for the compiler. - 058c0fb
-- Temporarily kill the AWS publish CI step - 8347ee2
-
-Compatibility notes:
-- A JSON polyfill is required to run the compiler under IE8 and below. It's recommended that the precompiler be used in lieu of running the compiler on these legacy environments.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.1...v2.0.0-alpha.2)
-
-## v2.0.0-alpha.1 - February 10th, 2014
-- [#182](https://github.com/wycats/handlebars.js/pull/182) - Allow passing hash parameters to partials ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#392](https://github.com/wycats/handlebars.js/pull/392) - Access to root context in partials and helpers ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#472](https://github.com/wycats/handlebars.js/issues/472) - Helpers cannot have decimal parameters ([@kayleg](https://api.github.com/users/kayleg))
-- [#569](https://github.com/wycats/handlebars.js/pull/569) - Unable to lookup array values using @index ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#491](https://github.com/wycats/handlebars.js/pull/491) - For nested helpers: get the @ variables of the outer helper from the inner one ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#669](https://github.com/wycats/handlebars.js/issues/669) - Ability to unregister a helper ([@dbachrach](https://api.github.com/users/dbachrach))
-- [#730](https://github.com/wycats/handlebars.js/pull/730) - Raw block helpers ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#634](https://github.com/wycats/handlebars.js/pull/634) - It would be great to have the helper name passed to `blockHelperMissing` ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#729](https://github.com/wycats/handlebars.js/pull/729) - Convert template spec to object literal ([@kpdecker](https://api.github.com/users/kpdecker))
-
-- [#658](https://github.com/wycats/handlebars.js/issues/658) - Depthed helpers do not work after an upgrade from 1.0.0 ([@xibxor](https://api.github.com/users/xibxor))
-- [#671](https://github.com/wycats/handlebars.js/issues/671) - Crashes on no-parameter {{#each}} ([@stepancheg](https://api.github.com/users/stepancheg))
-- [#689](https://github.com/wycats/handlebars.js/issues/689) - broken template precompilation ([@AAS](https://api.github.com/users/AAS))
-- [#698](https://github.com/wycats/handlebars.js/pull/698) - Fix parser generation under windows ([@osiris43](https://api.github.com/users/osiris43))
-- [#699](https://github.com/wycats/handlebars.js/issues/699) - @DATA not compiles to invalid JS in stringParams mode ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#705](https://github.com/wycats/handlebars.js/issues/705) - 1.3.0 can not be wrapped in an IIFE ([@craigteegarden](https://api.github.com/users/craigteegarden))
-- [#706](https://github.com/wycats/handlebars.js/pull/706) - README: Use with helper instead of relying on blockHelperMissing ([@scottgonzalez](https://api.github.com/users/scottgonzalez))
-
-- [#700](https://github.com/wycats/handlebars.js/pull/700) - Remove redundant conditions ([@blakeembrey](https://api.github.com/users/blakeembrey))
-- [#704](https://github.com/wycats/handlebars.js/pull/704) - JavaScript Compiler Cleanup ([@blakeembrey](https://api.github.com/users/blakeembrey))
-
-Compatibility notes:
-- `helperMissing` helper no longer has the indexed name argument. Helper name is now available via `options.name`.
-- Precompiler output has changed, which breaks compatibility with prior versions of the runtime and precompiled output.
-- `JavaScriptCompiler.compilerInfo` now returns generic objects rather than javascript source.
-- AST changes
-  - INTEGER -> NUMBER
-  - Additional PartialNode hash parameter
-  - New RawBlockNode type
-- Data frames now have a `_parent` field. This is internal but is enumerable for performance/compatability reasons.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.3.0...v2.0.0-alpha.1)
-
-## v1.3.0 - January 1st, 2014
-- [#690](https://github.com/wycats/handlebars.js/pull/690) - Added support for subexpressions ([@machty](https://api.github.com/users/machty))
-- [#696](https://github.com/wycats/handlebars.js/pull/696) - Fix for reserved keyword "default" ([@nateirwin](https://api.github.com/users/nateirwin))
-- [#692](https://github.com/wycats/handlebars.js/pull/692) - add line numbers to nodes when parsing ([@fivetanley](https://api.github.com/users/fivetanley))
-- [#695](https://github.com/wycats/handlebars.js/pull/695) - Pull options out from param setup to allow easier extension ([@blakeembrey](https://api.github.com/users/blakeembrey))
-- [#694](https://github.com/wycats/handlebars.js/pull/694) - Make the environment reusable ([@blakeembrey](https://api.github.com/users/blakeembrey))
-- [#636](https://github.com/wycats/handlebars.js/issues/636) - Print line and column of errors ([@sgronblo](https://api.github.com/users/sgronblo))
-- Use literal for data lookup - c1a93d3
-- Add stack handling sanity checks - cd885bf
-- Fix stack id "leak" on replaceStack - ddfe457
-- Fix incorrect stack pop when replacing literals - f4d337d
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.2.1...v1.3.0)
-
-## v1.2.1 - December 26th, 2013
-- [#684](https://github.com/wycats/handlebars.js/pull/684) - Allow any number of trailing characters for valid JavaScript variable ([@blakeembrey](https://api.github.com/users/blakeembrey))
-- [#686](https://github.com/wycats/handlebars.js/pull/686) - Falsy AMD module names in version 1.2.0 ([@kpdecker](https://api.github.com/users/kpdecker))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.2.0...v1.2.1)
-
-## v1.2.0 - December 23rd, 2013
-- [#675](https://github.com/wycats/handlebars.js/issues/675) - Cannot compile empty template for partial ([@erwinw](https://api.github.com/users/erwinw))
-- [#677](https://github.com/wycats/handlebars.js/issues/677) - Triple brace statements fail under IE ([@hamzaCM](https://api.github.com/users/hamzaCM))
-- [#655](https://github.com/wycats/handlebars.js/issues/655) - Loading Handlebars using bower ([@niki4810](https://api.github.com/users/niki4810))
-- [#657](https://github.com/wycats/handlebars.js/pull/657) - Fixes issue where cli compiles non handlebars templates ([@chrishoage](https://api.github.com/users/chrishoage))
-- [#681](https://github.com/wycats/handlebars.js/pull/681) - Adds in-browser testing and Saucelabs CI ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#661](https://github.com/wycats/handlebars.js/pull/661) - Add @first and @index to #each object iteration ([@cgp](https://api.github.com/users/cgp))
-- [#650](https://github.com/wycats/handlebars.js/pull/650) - Handlebars is MIT-licensed ([@thomasboyt](https://api.github.com/users/thomasboyt))
-- [#641](https://github.com/wycats/handlebars.js/pull/641) - Document ember testing process ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#662](https://github.com/wycats/handlebars.js/issues/662) - handlebars-source 1.1.2 is missing from RubyGems.
-- [#656](https://github.com/wycats/handlebars.js/issues/656) - Expose COMPILER_REVISION checks as a hook ([@machty](https://api.github.com/users/machty))
-- [#668](https://github.com/wycats/handlebars.js/issues/668) - Consider publishing handlebars-runtime as a separate module on npm ([@dlmanning](https://api.github.com/users/dlmanning))
-- [#679](https://github.com/wycats/handlebars.js/issues/679) - Unable to override invokePartial ([@mattbrailsford](https://api.github.com/users/mattbrailsford))
-- [#646](https://github.com/wycats/handlebars.js/pull/646) - Fix "\\{{" immediately following "\{{" ([@dmarcotte](https://api.github.com/users/dmarcotte))
-- Allow extend to work with non-prototyped objects - eb53f2e
-- Add JavascriptCompiler public API tests - 1a751b2
-- Add AST test coverage for more complex paths - ddea5be
-- Fix handling of boolean escape in MustacheNode - b4968bb
-
-Compatibility notes:
-- `@index` and `@first` are now supported for `each` iteration on objects
-- `Handlebars.VM.checkRevision` and `Handlebars.JavaScriptCompiler.prototype.compilerInfo` now available to modify the version checking behavior.
-- Browserify users may link to the runtime library via `require('handlebars/runtime')`
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.1.2...v1.2.0)
-
-## v1.1.2 - November 5th, 2013
-
-- [#645](https://github.com/wycats/handlebars.js/issues/645) - 1.1.1 fails under IE8 ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#644](https://github.com/wycats/handlebars.js/issues/644) - Using precompiled templates (AMD mode) with handlebars.runtime 1.1.1 ([@fddima](https://api.github.com/users/fddima))
-
-- Add simple binary utility tests - 96a45a4
-- Fix empty string compilation - eea708a
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.1.1...v1.1.2)
-
-## v1.1.1 - November 4th, 2013
-
-- [#642](https://github.com/wycats/handlebars.js/issues/642) - handlebars 1.1.0 are broken with nodejs
-
-- Fix release notes link - 17ba258
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.1.0...v1.1.1)
-
-## v1.1.0 - November 3rd, 2013
-
-- [#628](https://github.com/wycats/handlebars.js/pull/628) - Convert code to ES6 modules ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#336](https://github.com/wycats/handlebars.js/pull/336) - Add whitespace control syntax ([@kpdecker](https://api.github.com/users/kpdecker))
-- [#535](https://github.com/wycats/handlebars.js/pull/535) - Fix for probable JIT error under Safari ([@sorentwo](https://api.github.com/users/sorentwo))
-- [#483](https://github.com/wycats/handlebars.js/issues/483) - Add first and last @ vars to each helper ([@denniskuczynski](https://api.github.com/users/denniskuczynski))
-- [#557](https://github.com/wycats/handlebars.js/pull/557) - `\\{{foo}}` escaping only works in some situations ([@dmarcotte](https://api.github.com/users/dmarcotte))
-- [#552](https://github.com/wycats/handlebars.js/pull/552) - Added BOM removal flag. ([@blessenm](https://api.github.com/users/blessenm))
-- [#543](https://github.com/wycats/handlebars.js/pull/543) - publish passing master builds to s3 ([@fivetanley](https://api.github.com/users/fivetanley))
-
-- [#608](https://github.com/wycats/handlebars.js/issues/608) - Add `includeZero` flag to `if` conditional
-- [#498](https://github.com/wycats/handlebars.js/issues/498) - `Handlebars.compile` fails on empty string although a single blank works fine
-- [#599](https://github.com/wycats/handlebars.js/issues/599) - lambda helpers only receive options if used with arguments
-- [#592](https://github.com/wycats/handlebars.js/issues/592) - Optimize array and subprogram performance
-- [#571](https://github.com/wycats/handlebars.js/issues/571) - uglify upgrade breaks compatibility with older versions of node
-- [#587](https://github.com/wycats/handlebars.js/issues/587) - Partial inside partial breaks?
-
-
-Compatibility notes:
-- The project now includes separate artifacts for AMD, CommonJS, and global objects. 
-  - AMD: Users may load the bundled `handlebars.amd.js` or `handlebars.runtime.amd.js` files or load individual modules directly. AMD users should also note that the handlebars object is exposed via the `default` field on the imported object. This [gist](https://gist.github.com/wycats/7417be0dc361a69d5916) provides some discussion of possible compatibility shims.
-  - CommonJS/Node: Node loading occurs as normal via `require`
-  - Globals: The `handlebars.js` and `handlebars.runtime.js` files should behave in the same manner as the v1.0.12 / 1.0.0 release.
-- Build artifacts have been removed from the repository. [npm][npm], [components/handlebars.js][components], [cdnjs][cdnjs], or the [builds page][builds-page] should now be used as the source of built artifacts. 
-- Context-stored helpers are now always passed the `options` hash. Previously no-argument helpers did not have this argument.
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.0.12...v1.1.0)
-
-## v1.0.12 / 1.0.0 - May 31 2013
-
-- [#515](https://github.com/wycats/handlebars.js/issues/515) - Add node require extensions support ([@jjclark1982](https://github.com/jjclark1982))
-- [#517](https://github.com/wycats/handlebars.js/issues/517) - Fix amd precompiler output with directories ([@blessenm](https://github.com/blessenm))
-- [#433](https://github.com/wycats/handlebars.js/issues/433) - Add support for unicode ids
-- [#469](https://github.com/wycats/handlebars.js/issues/469) - Add support for `?` in ids
-- [#534](https://github.com/wycats/handlebars.js/issues/534) - Protect from object prototype modifications
-- [#519](https://github.com/wycats/handlebars.js/issues/519) - Fix partials with . name ([@jamesgorrie](https://github.com/jamesgorrie))
-- [#519](https://github.com/wycats/handlebars.js/issues/519) - Allow ID or strings in partial names
-- [#437](https://github.com/wycats/handlebars.js/issues/437) - Require matching brace counts in escaped expressions
-- Merge passed partials and helpers with global namespace values
-- Add support for complex ids in @data references
-- Docs updates
-
-Compatibility notes:
-- The parser is now stricter on `{{{`, requiring that the end token be `}}}`. Templates that do not
-  follow this convention should add the additional brace value.
-- Code that relies on global the namespace being muted when custom helpers or partials are passed will need to explicitly pass an `undefined` value for any helpers that should not be available.
-- The compiler version has changed. Precompiled templates with 1.0.12 or higher must use the 1.0.0 or higher runtime.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.0.11...v1.0.12)
-
-## v1.0.11 / 1.0.0-rc4 - May 13 2013
-
-- [#458](https://github.com/wycats/handlebars.js/issues/458) - Fix `./foo` syntax ([@jpfiset](https://github.com/jpfiset))
-- [#460](https://github.com/wycats/handlebars.js/issues/460) - Allow `:` in unescaped identifers ([@jpfiset](https://github.com/jpfiset))
-- [#471](https://github.com/wycats/handlebars.js/issues/471) - Create release notes (These!)
-- [#456](https://github.com/wycats/handlebars.js/issues/456) - Allow escaping of `\\`
-- [#211](https://github.com/wycats/handlebars.js/issues/211) - Fix exception in `escapeExpression`
-- [#375](https://github.com/wycats/handlebars.js/issues/375) - Escape unicode newlines
-- [#461](https://github.com/wycats/handlebars.js/issues/461) - Do not fail when compiling `""`
-- [#302](https://github.com/wycats/handlebars.js/issues/302) - Fix sanity check in knownHelpersOnly mode
-- [#369](https://github.com/wycats/handlebars.js/issues/369) - Allow registration of multiple helpers and partial by passing definition object
-- Add bower package declaration ([@DevinClark](https://github.com/DevinClark))
-- Add NuSpec package declaration ([@MikeMayer](https://github.com/MikeMayer))
-- Handle empty context in `with` ([@thejohnfreeman](https://github.com/thejohnfreeman))
-- Support custom template extensions in CLI ([@matteoagosti](https://github.com/matteoagosti))
-- Fix Rhino support ([@broady](https://github.com/broady))
-- Include contexts in string mode ([@leshill](https://github.com/leshill))
-- Return precompiled scripts when compiling to AMD ([@JamesMaroney](https://github.com/JamesMaroney))
-- Docs updates ([@iangreenleaf](https://github.com/iangreenleaf), [@gilesbowkett](https://github.com/gilesbowkett), [@utkarsh2012](https://github.com/utkarsh2012))
-- Fix `toString` handling under IE and browserify ([@tommydudebreaux](https://github.com/tommydudebreaux))
-- Add program metadata
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.0.10...v1.0.11)
-
-## v1.0.10 - Node - Feb 27 2013
-
-- [#428](https://github.com/wycats/handlebars.js/issues/428) - Fix incorrect rendering of nested programs
-- Fix exception message ([@tricknotes](https://github.com/tricknotes))
-- Added negative number literal support
-- Concert library to single IIFE
-- Add handlebars-source gemspec ([@machty](https://github.com/machty))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.0.9...v1.0.10)
-
-## v1.0.9 - Node - Feb 15 2013
-
-- Added `Handlebars.create` API in node module for sandboxed instances ([@tommydudebreaux](https://github.com/tommydudebreaux))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/1.0.0-rc.3...v1.0.9)
-
-## 1.0.0-rc3 - Browser - Feb 14 2013
-
-- Prevent use of `this` or `..` in illogical place ([@leshill](https://github.com/leshill))
-- Allow AST passing for `parse`/`compile`/`precompile` ([@machty](https://github.com/machty))
-- Optimize generated output by inlining statements where possible
-- Check compiler version when evaluating templates
-- Package browser dist in npm package
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v1.0.8...1.0.0-rc.3)
-
-## Prior Versions
-
-When upgrading from the Handlebars 0.9 series, be aware that the
-signature for passing custom helpers or partials to templates has
-changed.
-
-Instead of:
-
-```js
-template(context, helpers, partials, [data])
-```
-
-Use:
-
-```js
-template(context, {helpers: helpers, partials: partials, data: data})
-```
-
-[builds-page]: http://builds.handlebarsjs.com.s3.amazonaws.com/index.html
-[cdnjs]: http://cdnjs.com/libraries/handlebars.js/
-[components]: https://github.com/components/handlebars.js
-[npm]: https://npmjs.org/package/handlebars
diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
deleted file mode 100644
index 306207cd2..000000000
--- a/lib/handlebars/runtime.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Create a simple path alias to allow browserify to resolve
-// the runtime on a supported path.
-module.exports = require('./dist/cjs/handlebars.runtime')['default'];
diff --git a/lib/handlebars/spec/.eslintrc b/lib/handlebars/spec/.eslintrc
deleted file mode 100644
index 21871d52f..000000000
--- a/lib/handlebars/spec/.eslintrc
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "globals": {
-    "CompilerContext": true,
-    "Handlebars": true,
-    "handlebarsEnv": true,
-
-    "shouldCompileTo": true,
-    "shouldCompileToWithPartials": true,
-    "shouldThrow": true,
-    "compileWithPartials": true,
-
-    "console": true,
-    "require": true,
-    "suite": true,
-    "equal": true,
-    "equals": true,
-    "test": true,
-    "testBoth": true,
-    "raises": true,
-    "deepEqual": true,
-    "start": true,
-    "stop": true,
-    "ok": true,
-    "strictEqual": true,
-    "define": true
-  },
-  "env": {
-    "mocha": true
-  },
-  "rules": {
-    // Disabling for tests, for now.
-    "no-path-concat": 0,
-
-    "no-var": 0
-  }
-}
\ No newline at end of file
diff --git a/lib/handlebars/spec/amd-runtime.html b/lib/handlebars/spec/amd-runtime.html
deleted file mode 100644
index 7cc64f190..000000000
--- a/lib/handlebars/spec/amd-runtime.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<html>
-  <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      mocha.setup('bdd');
-    </script>
-
-    <script src="/spec/env/json2.js"></script>
-    <script src="/spec/env/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
-    <script>
-      var requireFailure;
-
-      requirejs.config({
-        paths: {
-          'handlebars.runtime': '/dist/handlebars.runtime.amd'
-        }
-      });
-      requirejs.onError = function (err) {
-        requireFailure = err;
-      };
-    </script>
-    <script>
-      onload = function(){
-        require(['handlebars.runtime'], function(Handlebars) {
-          describe('runtime', function() {
-            it('should load', function() {
-              equal(!!Handlebars['default'].template, true);
-              equal(!!Handlebars['default'].VERSION, true);
-            });
-          });
-
-          mocha.globals(['mochaResults'])
-          // The test harness leaks under FF. We should have decent global leak coverage from other tests
-          if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-            mocha.checkLeaks();
-          }
-          var runner = mocha.run();
-
-          //Reporting for saucelabs
-          var failedTests = [];
-          runner.on('end', function(){
-            window.mochaResults = runner.stats;
-            window.mochaResults.reports = failedTests;
-          });
-
-          runner.on('fail', logFailure);
-
-          // Inject any require initilizer failures into the first test so they are properly
-          // reported.
-          if (requireFailure) {
-            runner.on('hook end', function(hook){
-              if (requireFailure) {
-                runner.uncaught(requireFailure);
-                requireFailure = undefined;
-              }
-            });
-          }
-
-          function logFailure(test, err){
-
-            var flattenTitles = function(test){
-              var titles = [];
-              while (test.parent.title){
-                titles.push(test.parent.title);
-                test = test.parent;
-              }
-              return titles.reverse();
-            };
-
-            failedTests.push({
-              name: test.title,
-              result: false,
-              message: err.message,
-              stack: err.stack,
-              titles: flattenTitles(test)
-            });
-          }
-        });
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-  </body>
-</html>
diff --git a/lib/handlebars/spec/amd.html b/lib/handlebars/spec/amd.html
deleted file mode 100644
index 5de33c1cf..000000000
--- a/lib/handlebars/spec/amd.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-  <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      mocha.setup('bdd');
-    </script>
-
-    <script src="/spec/env/json2.js"></script>
-    <script src="/spec/env/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
-    <script>
-      var requireFailure;
-
-      requirejs.config({
-        paths: {
-          handlebars: '/dist/handlebars.amd',
-          tests: '/tmp/tests'
-        }
-      });
-      requirejs.onError = function (err) {
-        requireFailure = err;
-      };
-
-      var CompilerContext = {
-        compile: function(template, options) {
-          var templateSpec = handlebarsEnv.precompile(template, options);
-          return handlebarsEnv.template(safeEval(templateSpec));
-        },
-        compileWithPartial: function(template, options) {
-          return handlebarsEnv.compile(template, options);
-        }
-      };
-
-      function safeEval(templateSpec) {
-        try {
-          var ret;
-          eval('ret = ' + templateSpec);
-          return ret;
-        } catch (err) {
-          console.error(templateSpec);
-          throw err;
-        }
-      }
-    </script>
-    <script>
-      onload = function(){
-
-        require(['handlebars'], function(Handlebars) {
-          window.Handlebars = Handlebars['default'];
-
-          require(['tests'], function(Handlebars) {
-            mocha.globals(['mochaResults'])
-            // The test harness leaks under FF. We should have decent global leak coverage from other tests
-            if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-              mocha.checkLeaks();
-            }
-            var runner = mocha.run();
-
-            //Reporting for saucelabs
-            var failedTests = [];
-            runner.on('end', function(){
-              window.mochaResults = runner.stats;
-              window.mochaResults.reports = failedTests;
-            });
-
-            runner.on('fail', logFailure);
-
-            // Inject any require initilizer failures into the first test so they are properly
-            // reported.
-            if (requireFailure) {
-              runner.on('hook end', function(hook){
-                if (requireFailure) {
-                  runner.uncaught(requireFailure);
-                  requireFailure = undefined;
-                }
-              });
-            }
-
-            function logFailure(test, err){
-              function flattenTitles(test){
-                var titles = [];
-                while (test.parent.title){
-                  titles.push(test.parent.title);
-                  test = test.parent;
-                }
-                return titles.reverse();
-              }
-
-              failedTests.push({
-                name: test.title,
-                result: false,
-                message: err.message,
-                stack: err.stack,
-                titles: flattenTitles(test)
-              });
-            }
-          });
-        });
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-  </body>
-</html>
diff --git a/lib/handlebars/spec/artifacts/bom.handlebars b/lib/handlebars/spec/artifacts/bom.handlebars
deleted file mode 100644
index 548d71419..000000000
--- a/lib/handlebars/spec/artifacts/bom.handlebars
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/lib/handlebars/spec/artifacts/empty.handlebars b/lib/handlebars/spec/artifacts/empty.handlebars
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/handlebars/spec/artifacts/example_1.handlebars b/lib/handlebars/spec/artifacts/example_1.handlebars
deleted file mode 100644
index 054e96cb8..000000000
--- a/lib/handlebars/spec/artifacts/example_1.handlebars
+++ /dev/null
@@ -1 +0,0 @@
-{{foo}}
diff --git a/lib/handlebars/spec/artifacts/example_2.hbs b/lib/handlebars/spec/artifacts/example_2.hbs
deleted file mode 100644
index 963eab972..000000000
--- a/lib/handlebars/spec/artifacts/example_2.hbs
+++ /dev/null
@@ -1 +0,0 @@
-Hello, {{name}}!
diff --git a/lib/handlebars/spec/ast.js b/lib/handlebars/spec/ast.js
deleted file mode 100644
index 6f492fddd..000000000
--- a/lib/handlebars/spec/ast.js
+++ /dev/null
@@ -1,289 +0,0 @@
-describe('ast', function() {
-  if (!Handlebars.AST) {
-    return;
-  }
-
-  var LOCATION_INFO = {
-    start: {
-      line: 1,
-      column: 1
-    },
-    end: {
-      line: 1,
-      column: 1
-    }
-  };
-
-  function testLocationInfoStorage(node) {
-    equals(node.loc.start.line, 1);
-    equals(node.loc.start.column, 1);
-    equals(node.loc.end.line, 1);
-    equals(node.loc.end.column, 1);
-  }
-
-  describe('MustacheStatement', function() {
-    it('should store args', function() {
-      var mustache = new handlebarsEnv.AST.MustacheStatement({}, null, null, true, {}, LOCATION_INFO);
-      equals(mustache.type, 'MustacheStatement');
-      equals(mustache.escaped, true);
-      testLocationInfoStorage(mustache);
-    });
-  });
-  describe('BlockStatement', function() {
-    it('should throw on mustache mismatch', function() {
-      shouldThrow(function() {
-        handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
-      }, Handlebars.Exception, "foo doesn't match bar - 2:5");
-    });
-
-    it('stores location info', function() {
-      var mustacheNode = new handlebarsEnv.AST.MustacheStatement([{ original: 'foo'}], null, null, false, {});
-      var block = new handlebarsEnv.AST.BlockStatement(
-            mustacheNode,
-            null, null,
-            {body: []},
-            {body: []},
-            {},
-            {},
-            {},
-            LOCATION_INFO);
-      testLocationInfoStorage(block);
-    });
-  });
-  describe('PathExpression', function() {
-    it('stores location info', function() {
-      var idNode = new handlebarsEnv.AST.PathExpression(false, 0, [], 'foo', LOCATION_INFO);
-      testLocationInfoStorage(idNode);
-    });
-  });
-
-  describe('Hash', function() {
-    it('stores location info', function() {
-      var hash = new handlebarsEnv.AST.Hash([], LOCATION_INFO);
-      testLocationInfoStorage(hash);
-    });
-  });
-
-  describe('ContentStatement', function() {
-    it('stores location info', function() {
-      var content = new handlebarsEnv.AST.ContentStatement('HI', LOCATION_INFO);
-      testLocationInfoStorage(content);
-    });
-  });
-
-  describe('CommentStatement', function() {
-    it('stores location info', function() {
-      var comment = new handlebarsEnv.AST.CommentStatement('HI', {}, LOCATION_INFO);
-      testLocationInfoStorage(comment);
-    });
-  });
-
-  describe('NumberLiteral', function() {
-    it('stores location info', function() {
-      var integer = new handlebarsEnv.AST.NumberLiteral('6', LOCATION_INFO);
-      testLocationInfoStorage(integer);
-    });
-  });
-
-  describe('StringLiteral', function() {
-    it('stores location info', function() {
-      var string = new handlebarsEnv.AST.StringLiteral('6', LOCATION_INFO);
-      testLocationInfoStorage(string);
-    });
-  });
-
-  describe('BooleanLiteral', function() {
-    it('stores location info', function() {
-      var bool = new handlebarsEnv.AST.BooleanLiteral('true', LOCATION_INFO);
-      testLocationInfoStorage(bool);
-    });
-  });
-
-  describe('PartialStatement', function() {
-    it('stores location info', function() {
-      var pn = new handlebarsEnv.AST.PartialStatement('so_partial', [], {}, {}, LOCATION_INFO);
-      testLocationInfoStorage(pn);
-    });
-  });
-
-  describe('Program', function() {
-    it('storing location info', function() {
-      var pn = new handlebarsEnv.AST.Program([], null, {}, LOCATION_INFO);
-      testLocationInfoStorage(pn);
-    });
-  });
-
-  describe('Line Numbers', function() {
-    var ast, body;
-
-    function testColumns(node, firstLine, lastLine, firstColumn, lastColumn) {
-      equals(node.loc.start.line, firstLine);
-      equals(node.loc.start.column, firstColumn);
-      equals(node.loc.end.line, lastLine);
-      equals(node.loc.end.column, lastColumn);
-    }
-
-    ast = Handlebars.parse('line 1 {{line1Token}}\n line 2 {{line2token}}\n line 3 {{#blockHelperOnLine3}}\nline 4{{line4token}}\n' +
-                           'line5{{else}}\n{{line6Token}}\n{{/blockHelperOnLine3}}');
-    body = ast.body;
-
-    it('gets ContentNode line numbers', function() {
-      var contentNode = body[0];
-      testColumns(contentNode, 1, 1, 0, 7);
-    });
-
-    it('gets MustacheStatement line numbers', function() {
-      var mustacheNode = body[1];
-      testColumns(mustacheNode, 1, 1, 7, 21);
-    });
-
-    it('gets line numbers correct when newlines appear', function() {
-      testColumns(body[2], 1, 2, 21, 8);
-    });
-
-    it('gets MustacheStatement line numbers correct across newlines', function() {
-      var secondMustacheStatement = body[3];
-      testColumns(secondMustacheStatement, 2, 2, 8, 22);
-     });
-
-     it('gets the block helper information correct', function() {
-       var blockHelperNode = body[5];
-       testColumns(blockHelperNode, 3, 7, 8, 23);
-     });
-
-     it('correctly records the line numbers the program of a block helper', function() {
-       var blockHelperNode = body[5],
-           program = blockHelperNode.program;
-
-       testColumns(program, 3, 5, 8, 5);
-     });
-
-     it('correctly records the line numbers of an inverse of a block helper', function() {
-       var blockHelperNode = body[5],
-           inverse = blockHelperNode.inverse;
-
-       testColumns(inverse, 5, 7, 5, 0);
-     });
-  });
-
-  describe('standalone flags', function() {
-    describe('mustache', function() {
-      it('does not mark mustaches as standalone', function() {
-        var ast = Handlebars.parse('  {{comment}} ');
-        equals(!!ast.body[0].value, true);
-        equals(!!ast.body[2].value, true);
-      });
-    });
-    describe('blocks', function() {
-      it('marks block mustaches as standalone', function() {
-        var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            block = ast.body[1];
-
-        equals(ast.body[0].value, '');
-
-        equals(block.program.body[0].value, 'foo\n');
-        equals(block.inverse.body[0].value, '  bar \n');
-
-        equals(ast.body[2].value, '');
-      });
-      it('marks initial block mustaches as standalone', function() {
-        var ast = Handlebars.parse('{{# comment}} \nfoo\n {{/comment}}'),
-            block = ast.body[0];
-
-        equals(block.program.body[0].value, 'foo\n');
-      });
-      it('marks mustaches with children as standalone', function() {
-        var ast = Handlebars.parse('{{# comment}} \n{{foo}}\n {{/comment}}'),
-            block = ast.body[0];
-
-        equals(block.program.body[0].value, '');
-        equals(block.program.body[1].path.original, 'foo');
-        equals(block.program.body[2].value, '\n');
-      });
-      it('marks nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-            body = ast.body[0].program.body,
-            block = body[1];
-
-        equals(body[0].value, '');
-
-        equals(block.program.body[0].value, 'foo\n');
-        equals(block.inverse.body[0].value, '  bar \n');
-
-        equals(body[0].value, '');
-      });
-      it('does not mark nested block mustaches as standalone', function() {
-        var ast = Handlebars.parse('{{#foo}} {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} {{/foo}}'),
-            body = ast.body[0].program.body,
-            block = body[1];
-
-        equals(body[0].omit, undefined);
-
-        equals(block.program.body[0].value, ' \nfoo\n');
-        equals(block.inverse.body[0].value, '  bar \n  ');
-
-        equals(body[0].omit, undefined);
-      });
-      it('does not mark nested initial block mustaches as standalone', function() {
-        var ast = Handlebars.parse('{{#foo}}{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}}{{/foo}}'),
-            body = ast.body[0].program.body,
-            block = body[0];
-
-        equals(block.program.body[0].value, ' \nfoo\n');
-        equals(block.inverse.body[0].value, '  bar \n  ');
-
-        equals(body[0].omit, undefined);
-      });
-
-      it('marks column 0 block mustaches as standalone', function() {
-        var ast = Handlebars.parse('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            block = ast.body[1];
-
-        equals(ast.body[0].omit, undefined);
-
-        equals(block.program.body[0].value, 'foo\n');
-        equals(block.inverse.body[0].value, '  bar \n');
-
-        equals(ast.body[2].value, '');
-      });
-    });
-    describe('partials', function() {
-      it('marks partial as standalone', function() {
-        var ast = Handlebars.parse('{{> partial }} ');
-        equals(ast.body[1].value, '');
-      });
-      it('marks indented partial as standalone', function() {
-        var ast = Handlebars.parse('  {{> partial }} ');
-        equals(ast.body[0].value, '');
-        equals(ast.body[1].indent, '  ');
-        equals(ast.body[2].value, '');
-      });
-      it('marks those around content as not standalone', function() {
-        var ast = Handlebars.parse('a{{> partial }}');
-        equals(ast.body[0].omit, undefined);
-
-        ast = Handlebars.parse('{{> partial }}a');
-        equals(ast.body[1].omit, undefined);
-      });
-    });
-    describe('comments', function() {
-      it('marks comment as standalone', function() {
-        var ast = Handlebars.parse('{{! comment }} ');
-        equals(ast.body[1].value, '');
-      });
-      it('marks indented comment as standalone', function() {
-        var ast = Handlebars.parse('  {{! comment }} ');
-        equals(ast.body[0].value, '');
-        equals(ast.body[2].value, '');
-      });
-      it('marks those around content as not standalone', function() {
-        var ast = Handlebars.parse('a{{! comment }}');
-        equals(ast.body[0].omit, undefined);
-
-        ast = Handlebars.parse('{{! comment }}a');
-        equals(ast.body[1].omit, undefined);
-      });
-    });
-  });
-});
-
diff --git a/lib/handlebars/spec/basic.js b/lib/handlebars/spec/basic.js
deleted file mode 100644
index f9b781b4a..000000000
--- a/lib/handlebars/spec/basic.js
+++ /dev/null
@@ -1,297 +0,0 @@
-global.handlebarsEnv = null;
-
-beforeEach(function() {
-  global.handlebarsEnv = Handlebars.create();
-});
-
-describe('basic context', function() {
-  it('most basic', function() {
-    shouldCompileTo('{{foo}}', { foo: 'foo' }, 'foo');
-  });
-
-  it('escaping', function() {
-    shouldCompileTo('\\{{foo}}', { foo: 'food' }, '{{foo}}');
-    shouldCompileTo('content \\{{foo}}', { foo: 'food' }, 'content {{foo}}');
-    shouldCompileTo('\\\\{{foo}}', { foo: 'food' }, '\\food');
-    shouldCompileTo('content \\\\{{foo}}', { foo: 'food' }, 'content \\food');
-    shouldCompileTo('\\\\ {{foo}}', { foo: 'food' }, '\\\\ food');
-  });
-
-  it('compiling with a basic context', function() {
-    shouldCompileTo('Goodbye\n{{cruel}}\n{{world}}!', {cruel: 'cruel', world: 'world'}, 'Goodbye\ncruel\nworld!',
-                    'It works if all the required keys are provided');
-  });
-
-  it('compiling with an undefined context', function() {
-    shouldCompileTo('Goodbye\n{{cruel}}\n{{world.bar}}!', undefined, 'Goodbye\n\n!');
-
-    shouldCompileTo('{{#unless foo}}Goodbye{{../test}}{{test2}}{{/unless}}', undefined, 'Goodbye');
-  });
-
-  it('comments', function() {
-    shouldCompileTo('{{! Goodbye}}Goodbye\n{{cruel}}\n{{world}}!',
-      {cruel: 'cruel', world: 'world'}, 'Goodbye\ncruel\nworld!',
-      'comments are ignored');
-
-    shouldCompileTo('    {{~! comment ~}}      blah', {}, 'blah');
-    shouldCompileTo('    {{~!-- long-comment --~}}      blah', {}, 'blah');
-    shouldCompileTo('    {{! comment ~}}      blah', {}, '    blah');
-    shouldCompileTo('    {{!-- long-comment --~}}      blah', {}, '    blah');
-    shouldCompileTo('    {{~! comment}}      blah', {}, '      blah');
-    shouldCompileTo('    {{~!-- long-comment --}}      blah', {}, '      blah');
-  });
-
-  it('boolean', function() {
-    var string = '{{#goodbye}}GOODBYE {{/goodbye}}cruel {{world}}!';
-    shouldCompileTo(string, {goodbye: true, world: 'world'}, 'GOODBYE cruel world!',
-                    'booleans show the contents when true');
-
-    shouldCompileTo(string, {goodbye: false, world: 'world'}, 'cruel world!',
-                    'booleans do not show the contents when false');
-  });
-
-  it('zeros', function() {
-    shouldCompileTo('num1: {{num1}}, num2: {{num2}}', {num1: 42, num2: 0},
-        'num1: 42, num2: 0');
-    shouldCompileTo('num: {{.}}', 0, 'num: 0');
-    shouldCompileTo('num: {{num1/num2}}', {num1: {num2: 0}}, 'num: 0');
-  });
-  it('false', function() {
-    /*eslint-disable no-new-wrappers */
-    shouldCompileTo('val1: {{val1}}, val2: {{val2}}', {val1: false, val2: new Boolean(false)}, 'val1: false, val2: false');
-    shouldCompileTo('val: {{.}}', false, 'val: false');
-    shouldCompileTo('val: {{val1/val2}}', {val1: {val2: false}}, 'val: false');
-
-    shouldCompileTo('val1: {{{val1}}}, val2: {{{val2}}}', {val1: false, val2: new Boolean(false)}, 'val1: false, val2: false');
-    shouldCompileTo('val: {{{val1/val2}}}', {val1: {val2: false}}, 'val: false');
-    /*eslint-enable */
-  });
-
-  it('should handle undefined and null', function() {
-    shouldCompileTo('{{awesome undefined null}}',
-        {
-          awesome: function(_undefined, _null, options) {
-            return (_undefined === undefined) + ' ' + (_null === null) + ' ' + (typeof options);
-          }
-        },
-        'true true object');
-    shouldCompileTo('{{undefined}}',
-        {
-          'undefined': function() {
-            return 'undefined!';
-          }
-        },
-        'undefined!');
-    shouldCompileTo('{{null}}',
-        {
-          'null': function() {
-            return 'null!';
-          }
-        },
-        'null!');
-  });
-
-  it('newlines', function() {
-      shouldCompileTo("Alan's\nTest", {}, "Alan's\nTest");
-      shouldCompileTo("Alan's\rTest", {}, "Alan's\rTest");
-  });
-
-  it('escaping text', function() {
-    shouldCompileTo("Awesome's", {}, "Awesome's", "text is escaped so that it doesn't get caught on single quotes");
-    shouldCompileTo('Awesome\\', {}, 'Awesome\\', "text is escaped so that the closing quote can't be ignored");
-    shouldCompileTo('Awesome\\\\ foo', {}, 'Awesome\\\\ foo', "text is escaped so that it doesn't mess up backslashes");
-    shouldCompileTo('Awesome {{foo}}', {foo: '\\'}, 'Awesome \\', "text is escaped so that it doesn't mess up backslashes");
-    shouldCompileTo(" ' ' ", {}, " ' ' ", 'double quotes never produce invalid javascript');
-  });
-
-  it('escaping expressions', function() {
-   shouldCompileTo('{{{awesome}}}', {awesome: '&\'\\<>'}, '&\'\\<>',
-          "expressions with 3 handlebars aren't escaped");
-
-   shouldCompileTo('{{&awesome}}', {awesome: '&\'\\<>'}, '&\'\\<>',
-          "expressions with {{& handlebars aren't escaped");
-
-   shouldCompileTo('{{awesome}}', {awesome: "&\"'`\\<>"}, '&amp;&quot;&#x27;&#x60;\\&lt;&gt;',
-          'by default expressions should be escaped');
-
-   shouldCompileTo('{{awesome}}', {awesome: 'Escaped, <b> looks like: &lt;b&gt;'}, 'Escaped, &lt;b&gt; looks like: &amp;lt;b&amp;gt;',
-          'escaping should properly handle amperstands');
-  });
-
-  it("functions returning safestrings shouldn't be escaped", function() {
-    var hash = {awesome: function() { return new Handlebars.SafeString('&\'\\<>'); }};
-    shouldCompileTo('{{awesome}}', hash, '&\'\\<>',
-        "functions returning safestrings aren't escaped");
-  });
-
-  it('functions', function() {
-    shouldCompileTo('{{awesome}}', {awesome: function() { return 'Awesome'; }}, 'Awesome',
-                    'functions are called and render their output');
-    shouldCompileTo('{{awesome}}', {awesome: function() { return this.more; }, more: 'More awesome'}, 'More awesome',
-                    'functions are bound to the context');
-  });
-
-  it('functions with context argument', function() {
-    shouldCompileTo('{{awesome frank}}',
-        {awesome: function(context) { return context; },
-          frank: 'Frank'},
-        'Frank', 'functions are called with context arguments');
-  });
-  it('pathed functions with context argument', function() {
-    shouldCompileTo('{{bar.awesome frank}}',
-        {bar: {awesome: function(context) { return context; }},
-          frank: 'Frank'},
-        'Frank', 'functions are called with context arguments');
-  });
-  it('depthed functions with context argument', function() {
-    shouldCompileTo('{{#with frank}}{{../awesome .}}{{/with}}',
-        {awesome: function(context) { return context; },
-          frank: 'Frank'},
-        'Frank', 'functions are called with context arguments');
-  });
-
-  it('block functions with context argument', function() {
-    shouldCompileTo('{{#awesome 1}}inner {{.}}{{/awesome}}',
-        {awesome: function(context, options) { return options.fn(context); }},
-        'inner 1', 'block functions are called with context and options');
-  });
-
-  it('depthed block functions with context argument', function() {
-    shouldCompileTo('{{#with value}}{{#../awesome 1}}inner {{.}}{{/../awesome}}{{/with}}',
-        {value: true, awesome: function(context, options) { return options.fn(context); }},
-        'inner 1', 'block functions are called with context and options');
-  });
-
-  it('block functions without context argument', function() {
-    shouldCompileTo('{{#awesome}}inner{{/awesome}}',
-        {awesome: function(options) { return options.fn(this); }},
-        'inner', 'block functions are called with options');
-  });
-  it('pathed block functions without context argument', function() {
-    shouldCompileTo('{{#foo.awesome}}inner{{/foo.awesome}}',
-        {foo: {awesome: function() { return this; }}},
-        'inner', 'block functions are called with options');
-  });
-  it('depthed block functions without context argument', function() {
-    shouldCompileTo('{{#with value}}{{#../awesome}}inner{{/../awesome}}{{/with}}',
-        {value: true, awesome: function() { return this; }},
-        'inner', 'block functions are called with options');
-  });
-
-
-  it('paths with hyphens', function() {
-    shouldCompileTo('{{foo-bar}}', {'foo-bar': 'baz'}, 'baz', 'Paths can contain hyphens (-)');
-    shouldCompileTo('{{foo.foo-bar}}', {foo: {'foo-bar': 'baz'}}, 'baz', 'Paths can contain hyphens (-)');
-    shouldCompileTo('{{foo/foo-bar}}', {foo: {'foo-bar': 'baz'}}, 'baz', 'Paths can contain hyphens (-)');
-  });
-
-  it('nested paths', function() {
-    shouldCompileTo('Goodbye {{alan/expression}} world!', {alan: {expression: 'beautiful'}},
-                    'Goodbye beautiful world!', 'Nested paths access nested objects');
-  });
-
-  it('nested paths with empty string value', function() {
-    shouldCompileTo('Goodbye {{alan/expression}} world!', {alan: {expression: ''}},
-                    'Goodbye  world!', 'Nested paths access nested objects with empty string');
-  });
-
-  it('literal paths', function() {
-    shouldCompileTo('Goodbye {{[@alan]/expression}} world!', {'@alan': {expression: 'beautiful'}},
-        'Goodbye beautiful world!', 'Literal paths can be used');
-    shouldCompileTo('Goodbye {{[foo bar]/expression}} world!', {'foo bar': {expression: 'beautiful'}},
-        'Goodbye beautiful world!', 'Literal paths can be used');
-  });
-
-  it('literal references', function() {
-    shouldCompileTo('Goodbye {{[foo bar]}} world!', {'foo bar': 'beautiful'},
-        'Goodbye beautiful world!', 'Literal paths can be used');
-  });
-
-  it("that current context path ({{.}}) doesn't hit helpers", function() {
-    shouldCompileTo('test: {{.}}', [null, {helper: 'awesome'}], 'test: ');
-  });
-
-  it('complex but empty paths', function() {
-    shouldCompileTo('{{person/name}}', {person: {name: null}}, '');
-    shouldCompileTo('{{person/name}}', {person: {}}, '');
-  });
-
-  it('this keyword in paths', function() {
-    var string = '{{#goodbyes}}{{this}}{{/goodbyes}}';
-    var hash = {goodbyes: ['goodbye', 'Goodbye', 'GOODBYE']};
-    shouldCompileTo(string, hash, 'goodbyeGoodbyeGOODBYE',
-      'This keyword in paths evaluates to current context');
-
-    string = '{{#hellos}}{{this/text}}{{/hellos}}';
-    hash = {hellos: [{text: 'hello'}, {text: 'Hello'}, {text: 'HELLO'}]};
-    shouldCompileTo(string, hash, 'helloHelloHELLO', 'This keyword evaluates in more complex paths');
-  });
-
-  it('this keyword nested inside path', function() {
-    shouldThrow(function() {
-      CompilerContext.compile('{{#hellos}}{{text/this/foo}}{{/hellos}}');
-    }, Error, 'Invalid path: text/this - 1:13');
-
-    shouldCompileTo('{{[this]}}', {'this': 'bar'}, 'bar');
-    shouldCompileTo('{{text/[this]}}', {text: {'this': 'bar'}}, 'bar');
-  });
-
-  it('this keyword in helpers', function() {
-    var helpers = {foo: function(value) {
-        return 'bar ' + value;
-    }};
-    var string = '{{#goodbyes}}{{foo this}}{{/goodbyes}}';
-    var hash = {goodbyes: ['goodbye', 'Goodbye', 'GOODBYE']};
-    shouldCompileTo(string, [hash, helpers], 'bar goodbyebar Goodbyebar GOODBYE',
-      'This keyword in paths evaluates to current context');
-
-    string = '{{#hellos}}{{foo this/text}}{{/hellos}}';
-    hash = {hellos: [{text: 'hello'}, {text: 'Hello'}, {text: 'HELLO'}]};
-    shouldCompileTo(string, [hash, helpers], 'bar hellobar Hellobar HELLO', 'This keyword evaluates in more complex paths');
-  });
-
-  it('this keyword nested inside helpers param', function() {
-    var string = '{{#hellos}}{{foo text/this/foo}}{{/hellos}}';
-    shouldThrow(function() {
-      CompilerContext.compile(string);
-    }, Error, 'Invalid path: text/this - 1:17');
-
-    shouldCompileTo(
-        '{{foo [this]}}',
-        {foo: function(value) { return value; }, 'this': 'bar'},
-        'bar');
-    shouldCompileTo(
-        '{{foo text/[this]}}',
-        {foo: function(value) { return value; }, text: {'this': 'bar'}},
-        'bar');
-  });
-
-  it('pass string literals', function() {
-    shouldCompileTo('{{"foo"}}', {}, '');
-    shouldCompileTo('{{"foo"}}', { foo: 'bar' }, 'bar');
-    shouldCompileTo('{{#"foo"}}{{.}}{{/"foo"}}', { foo: ['bar', 'baz'] }, 'barbaz');
-  });
-
-  it('pass number literals', function() {
-    shouldCompileTo('{{12}}', {}, '');
-    shouldCompileTo('{{12}}', { '12': 'bar' }, 'bar');
-    shouldCompileTo('{{12.34}}', {}, '');
-    shouldCompileTo('{{12.34}}', { '12.34': 'bar' }, 'bar');
-    shouldCompileTo('{{12.34 1}}', { '12.34': function(arg) { return 'bar' + arg; } }, 'bar1');
-  });
-
-  it('pass boolean literals', function() {
-    shouldCompileTo('{{true}}', {}, '');
-    shouldCompileTo('{{true}}', { '': 'foo' }, '');
-    shouldCompileTo('{{false}}', { 'false': 'foo' }, 'foo');
-  });
-
-  it('should handle literals in subexpression', function() {
-    var helpers = {
-      foo: function(arg) {
-        return arg;
-      }
-    };
-    shouldCompileTo('{{foo (false)}}', [{ 'false': function() { return 'bar'; } }, helpers], 'bar');
-  });
-});
diff --git a/lib/handlebars/spec/blocks.js b/lib/handlebars/spec/blocks.js
deleted file mode 100644
index 80f1580e6..000000000
--- a/lib/handlebars/spec/blocks.js
+++ /dev/null
@@ -1,152 +0,0 @@
-describe('blocks', function() {
-  it('array', function() {
-    var string = '{{#goodbyes}}{{text}}! {{/goodbyes}}cruel {{world}}!';
-    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-    shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-                    'Arrays iterate over the contents when not empty');
-
-    shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-                    'Arrays ignore the contents when empty');
-  });
-
-  it('array without data', function() {
-    var string = '{{#goodbyes}}{{text}}{{/goodbyes}} {{#goodbyes}}{{text}}{{/goodbyes}}';
-    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-    shouldCompileTo(string, [hash,,, false], 'goodbyeGoodbyeGOODBYE goodbyeGoodbyeGOODBYE');
-  });
-
-  it('array with @index', function() {
-    var string = '{{#goodbyes}}{{@index}}. {{text}}! {{/goodbyes}}cruel {{world}}!';
-    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-    var template = CompilerContext.compile(string);
-    var result = template(hash);
-
-    equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-  });
-
-  it('empty block', function() {
-    var string = '{{#goodbyes}}{{/goodbyes}}cruel {{world}}!';
-    var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-    shouldCompileTo(string, hash, 'cruel world!',
-                    'Arrays iterate over the contents when not empty');
-
-    shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-                    'Arrays ignore the contents when empty');
-  });
-
-  it('block with complex lookup', function() {
-    var string = '{{#goodbyes}}{{text}} cruel {{../name}}! {{/goodbyes}}';
-    var hash = {name: 'Alan', goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]};
-
-    shouldCompileTo(string, hash, 'goodbye cruel Alan! Goodbye cruel Alan! GOODBYE cruel Alan! ',
-                    'Templates can access variables in contexts up the stack with relative path syntax');
-  });
-
-  it('multiple blocks with complex lookup', function() {
-    var string = '{{#goodbyes}}{{../name}}{{../name}}{{/goodbyes}}';
-    var hash = {name: 'Alan', goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]};
-
-    shouldCompileTo(string, hash, 'AlanAlanAlanAlanAlanAlan');
-  });
-
-  it('block with complex lookup using nested context', function() {
-    var string = '{{#goodbyes}}{{text}} cruel {{foo/../name}}! {{/goodbyes}}';
-
-    shouldThrow(function() {
-      CompilerContext.compile(string);
-    }, Error);
-  });
-
-  it('block with deep nested complex lookup', function() {
-    var string = '{{#outer}}Goodbye {{#inner}}cruel {{../sibling}} {{../../omg}}{{/inner}}{{/outer}}';
-    var hash = {omg: 'OMG!', outer: [{ sibling: 'sad', inner: [{ text: 'goodbye' }] }] };
-
-    shouldCompileTo(string, hash, 'Goodbye cruel sad OMG!');
-  });
-
-  describe('inverted sections', function() {
-    it('inverted sections with unset value', function() {
-      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-      var hash = {};
-      shouldCompileTo(string, hash, 'Right On!', "Inverted section rendered when value isn't set.");
-    });
-
-    it('inverted section with false value', function() {
-      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-      var hash = {goodbyes: false};
-      shouldCompileTo(string, hash, 'Right On!', 'Inverted section rendered when value is false.');
-    });
-
-    it('inverted section with empty set', function() {
-      var string = '{{#goodbyes}}{{this}}{{/goodbyes}}{{^goodbyes}}Right On!{{/goodbyes}}';
-      var hash = {goodbyes: []};
-      shouldCompileTo(string, hash, 'Right On!', 'Inverted section rendered when value is empty set.');
-    });
-
-    it('block inverted sections', function() {
-      shouldCompileTo('{{#people}}{{name}}{{^}}{{none}}{{/people}}', {none: 'No people'},
-        'No people');
-    });
-    it('chained inverted sections', function() {
-      shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{/people}}', {none: 'No people'},
-        'No people');
-      shouldCompileTo('{{#people}}{{name}}{{else if nothere}}fail{{else unless nothere}}{{none}}{{/people}}', {none: 'No people'},
-        'No people');
-      shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{else}}fail{{/people}}', {none: 'No people'},
-        'No people');
-    });
-    it('chained inverted sections with mismatch', function() {
-      shouldThrow(function() {
-        shouldCompileTo('{{#people}}{{name}}{{else if none}}{{none}}{{/if}}', {none: 'No people'},
-          'No people');
-      }, Error);
-    });
-
-    it('block inverted sections with empty arrays', function() {
-      shouldCompileTo('{{#people}}{{name}}{{^}}{{none}}{{/people}}', {none: 'No people', people: []},
-        'No people');
-    });
-  });
-
-  describe('standalone sections', function() {
-    it('block standalone else sections', function() {
-      shouldCompileTo('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        'No people\n');
-      shouldCompileTo('{{#none}}\n{{.}}\n{{^}}\n{{none}}\n{{/none}}\n', {none: 'No people'},
-        'No people\n');
-      shouldCompileTo('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        'No people\n');
-    });
-    it('block standalone chained else sections', function() {
-      shouldCompileTo('{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
-        'No people\n');
-      shouldCompileTo('{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{^}}\n{{/people}}\n', {none: 'No people'},
-        'No people\n');
-    });
-    it('should handle nesting', function() {
-      shouldCompileTo('{{#data}}\n{{#if true}}\n{{.}}\n{{/if}}\n{{/data}}\nOK.', {data: [1, 3, 5]}, '1\n3\n5\nOK.');
-    });
-  });
-
-  describe('compat mode', function() {
-    it('block with deep recursive lookup lookup', function() {
-      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg}}{{/inner}}{{/outer}}';
-      var hash = {omg: 'OMG!', outer: [{ inner: [{ text: 'goodbye' }] }] };
-
-      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel OMG!');
-    });
-    it('block with deep recursive pathed lookup', function() {
-      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}';
-      var hash = {omg: {yes: 'OMG!'}, outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }] };
-
-      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel OMG!');
-    });
-    it('block with missed recursive lookup', function() {
-      var string = '{{#outer}}Goodbye {{#inner}}cruel {{omg.yes}}{{/inner}}{{/outer}}';
-      var hash = {omg: {no: 'OMG!'}, outer: [{ inner: [{ yes: 'no', text: 'goodbye' }] }] };
-
-      shouldCompileTo(string, [hash, undefined, undefined, true], 'Goodbye cruel ');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/builtins.js b/lib/handlebars/spec/builtins.js
deleted file mode 100644
index 46d70baac..000000000
--- a/lib/handlebars/spec/builtins.js
+++ /dev/null
@@ -1,344 +0,0 @@
-describe('builtin helpers', function() {
-  describe('#if', function() {
-    it('if', function() {
-      var string = '{{#if goodbye}}GOODBYE {{/if}}cruel {{world}}!';
-      shouldCompileTo(string, {goodbye: true, world: 'world'}, 'GOODBYE cruel world!',
-                      'if with boolean argument shows the contents when true');
-      shouldCompileTo(string, {goodbye: 'dummy', world: 'world'}, 'GOODBYE cruel world!',
-                      'if with string argument shows the contents');
-      shouldCompileTo(string, {goodbye: false, world: 'world'}, 'cruel world!',
-                      'if with boolean argument does not show the contents when false');
-      shouldCompileTo(string, {world: 'world'}, 'cruel world!',
-                      'if with undefined does not show the contents');
-      shouldCompileTo(string, {goodbye: ['foo'], world: 'world'}, 'GOODBYE cruel world!',
-                      'if with non-empty array shows the contents');
-      shouldCompileTo(string, {goodbye: [], world: 'world'}, 'cruel world!',
-                      'if with empty array does not show the contents');
-      shouldCompileTo(string, {goodbye: 0, world: 'world'}, 'cruel world!',
-                      'if with zero does not show the contents');
-      shouldCompileTo('{{#if goodbye includeZero=true}}GOODBYE {{/if}}cruel {{world}}!',
-                      {goodbye: 0, world: 'world'}, 'GOODBYE cruel world!',
-                      'if with zero does not show the contents');
-    });
-
-    it('if with function argument', function() {
-      var string = '{{#if goodbye}}GOODBYE {{/if}}cruel {{world}}!';
-      shouldCompileTo(string, {goodbye: function() {return true; }, world: 'world'}, 'GOODBYE cruel world!',
-                      'if with function shows the contents when function returns true');
-      shouldCompileTo(string, {goodbye: function() {return this.world; }, world: 'world'}, 'GOODBYE cruel world!',
-                      'if with function shows the contents when function returns string');
-      shouldCompileTo(string, {goodbye: function() {return false; }, world: 'world'}, 'cruel world!',
-                      'if with function does not show the contents when returns false');
-      shouldCompileTo(string, {goodbye: function() {return this.foo; }, world: 'world'}, 'cruel world!',
-                      'if with function does not show the contents when returns undefined');
-    });
-  });
-
-  describe('#with', function() {
-    it('with', function() {
-      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
-      shouldCompileTo(string, {person: {first: 'Alan', last: 'Johnson'}}, 'Alan Johnson');
-    });
-    it('with with function argument', function() {
-      var string = '{{#with person}}{{first}} {{last}}{{/with}}';
-      shouldCompileTo(string, {person: function() { return {first: 'Alan', last: 'Johnson'}; }}, 'Alan Johnson');
-    });
-    it('with with else', function() {
-      var string = '{{#with person}}Person is present{{else}}Person is not present{{/with}}';
-      shouldCompileTo(string, {}, 'Person is not present');
-    });
-  });
-
-  describe('#each', function() {
-    beforeEach(function() {
-      handlebarsEnv.registerHelper('detectDataInsideEach', function(options) {
-        return options.data && options.data.exclaim;
-      });
-    });
-
-    it('each', function() {
-      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-                      'each with array argument iterates over the contents when not empty');
-      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-                      'each with array argument ignores the contents when empty');
-    });
-
-    it('each without data', function() {
-      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-      shouldCompileTo(string, [hash,,,, false], 'goodbye! Goodbye! GOODBYE! cruel world!');
-
-      hash = {goodbyes: 'cruel', world: 'world'};
-      shouldCompileTo('{{#each .}}{{.}}{{/each}}', [hash,,,, false], 'cruelworld');
-    });
-
-    it('each without context', function() {
-      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      shouldCompileTo(string, [,,,, ], 'cruel !');
-    });
-
-    it('each with an object and @key', function() {
-      var string = '{{#each goodbyes}}{{@key}}. {{text}}! {{/each}}cruel {{world}}!';
-
-      function Clazz() {
-        this['<b>#1</b>'] = {text: 'goodbye'};
-        this[2] = {text: 'GOODBYE'};
-      }
-      Clazz.prototype.foo = 'fail';
-      var hash = {goodbyes: new Clazz(), world: 'world'};
-
-      // Object property iteration order is undefined according to ECMA spec,
-      // so we need to check both possible orders
-      // @see http://stackoverflow.com/questions/280713/elements-order-in-a-for-in-loop
-      var actual = compileWithPartials(string, hash);
-      var expected1 = '&lt;b&gt;#1&lt;/b&gt;. goodbye! 2. GOODBYE! cruel world!';
-      var expected2 = '2. GOODBYE! &lt;b&gt;#1&lt;/b&gt;. goodbye! cruel world!';
-
-      equals(actual === expected1 || actual === expected2, true, 'each with object argument iterates over the contents when not empty');
-      shouldCompileTo(string, {goodbyes: {}, world: 'world'}, 'cruel world!');
-    });
-
-    it('each with @index', function() {
-      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-    });
-
-    it('each with nested @index', function() {
-      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{#each ../goodbyes}}{{@index}} {{/each}}After {{@index}} {{/each}}{{@index}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '0. goodbye! 0 1 2 After 0 1. Goodbye! 0 1 2 After 1 2. GOODBYE! 0 1 2 After 2 cruel world!', 'The @index variable is used');
-    });
-
-    it('each with block params', function() {
-      var string = '{{#each goodbyes as |value index|}}{{index}}. {{value.text}}! {{#each ../goodbyes as |childValue childIndex|}} {{index}} {{childIndex}}{{/each}} After {{index}} {{/each}}{{index}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '0. goodbye!  0 0 0 1 After 0 1. Goodbye!  1 0 1 1 After 1 cruel world!');
-    });
-
-    it('each object with @index', function() {
-      var string = '{{#each goodbyes}}{{@index}}. {{text}}! {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: {'a': {text: 'goodbye'}, b: {text: 'Goodbye'}, c: {text: 'GOODBYE'}}, world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '0. goodbye! 1. Goodbye! 2. GOODBYE! cruel world!', 'The @index variable is used');
-    });
-
-
-    it('each with @first', function() {
-      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
-    });
-
-    it('each with nested @first', function() {
-      var string = '{{#each goodbyes}}({{#if @first}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @first}}{{text}}!{{/if}}{{/each}}{{#if @first}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '(goodbye! goodbye! goodbye!) (goodbye!) (goodbye!) cruel world!', 'The @first variable is used');
-    });
-
-    it('each object with @first', function() {
-      var string = '{{#each goodbyes}}{{#if @first}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, 'goodbye! cruel world!', 'The @first variable is used');
-    });
-
-    it('each with @last', function() {
-      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, 'GOODBYE! cruel world!', 'The @last variable is used');
-    });
-
-    it('each object with @last', function() {
-      var string = '{{#each goodbyes}}{{#if @last}}{{text}}! {{/if}}{{/each}}cruel {{world}}!';
-      var hash = {goodbyes: {'foo': {text: 'goodbye'}, bar: {text: 'Goodbye'}}, world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, 'Goodbye! cruel world!', 'The @last variable is used');
-    });
-
-    it('each with nested @last', function() {
-      var string = '{{#each goodbyes}}({{#if @last}}{{text}}! {{/if}}{{#each ../goodbyes}}{{#if @last}}{{text}}!{{/if}}{{/each}}{{#if @last}} {{text}}!{{/if}}) {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}], world: 'world'};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '(GOODBYE!) (GOODBYE!) (GOODBYE! GOODBYE! GOODBYE!) cruel world!', 'The @last variable is used');
-    });
-
-    it('each with function argument', function() {
-      var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-      var hash = {goodbyes: function() { return [{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]; }, world: 'world'};
-      shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-                'each with array function argument iterates over the contents when not empty');
-      shouldCompileTo(string, {goodbyes: [], world: 'world'}, 'cruel world!',
-                'each with array function argument ignores the contents when empty');
-    });
-
-    it('data passed to helpers', function() {
-      var string = '{{#each letters}}{{this}}{{detectDataInsideEach}}{{/each}}';
-      var hash = {letters: ['a', 'b', 'c']};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash, {
-        data: {
-          exclaim: '!'
-        }
-      });
-      equal(result, 'a!b!c!', 'should output data');
-    });
-
-    it('each on implicit context', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{#each}}{{text}}! {{/each}}cruel world!');
-        template({});
-      }, handlebarsEnv.Exception, 'Must pass iterator to #each');
-    });
-  });
-
-  describe('#log', function() {
-    /*eslint-disable no-console */
-    if (typeof console === 'undefined') {
-      return;
-    }
-
-    var $log,
-        $info,
-        $error;
-    beforeEach(function() {
-      $log = console.log;
-      $info = console.info;
-      $error = console.error;
-    });
-    afterEach(function() {
-      console.log = $log;
-      console.info = $info;
-      console.error = $error;
-    });
-
-    it('should call logger at default level', function() {
-      var string = '{{log blah}}';
-      var hash = { blah: 'whee' };
-
-      var levelArg, logArg;
-      handlebarsEnv.log = function(level, arg) {
-        levelArg = level;
-        logArg = arg;
-      };
-
-      shouldCompileTo(string, hash, '', 'log should not display');
-      equals(1, levelArg, 'should call log with 1');
-      equals('whee', logArg, "should call log with 'whee'");
-    });
-    it('should call logger at data level', function() {
-      var string = '{{log blah}}';
-      var hash = { blah: 'whee' };
-
-      var levelArg, logArg;
-      handlebarsEnv.log = function(level, arg) {
-        levelArg = level;
-        logArg = arg;
-      };
-
-      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-      equals(3, levelArg);
-      equals('whee', logArg);
-    });
-    it('should output to info', function() {
-      var string = '{{log blah}}';
-      var hash = { blah: 'whee' };
-      var called;
-
-      console.info = function(info) {
-        equals('whee', info);
-        called = true;
-      };
-      console.log = function(log) {
-        equals('whee', log);
-        called = true;
-      };
-
-      shouldCompileTo(string, hash, '');
-      equals(true, called);
-    });
-    it('should log at data level', function() {
-      var string = '{{log blah}}';
-      var hash = { blah: 'whee' };
-      var called;
-
-      console.error = function(log) {
-        equals('whee', log);
-        called = true;
-      };
-
-      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-      equals(true, called);
-    });
-    it('should handle missing logger', function() {
-      var string = '{{log blah}}';
-      var hash = { blah: 'whee' };
-
-      console.error = undefined;
-
-      shouldCompileTo(string, [hash,,,, {level: '03'}], '');
-    });
-    /*eslint-enable no-console */
-  });
-
-
-  describe('#lookup', function() {
-    it('should lookup arbitrary content', function() {
-      var string = '{{#each goodbyes}}{{lookup ../data .}}{{/each}}',
-          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, 'foobar');
-    });
-    it('should not fail on undefined value', function() {
-      var string = '{{#each goodbyes}}{{lookup ../bar .}}{{/each}}',
-          hash = {goodbyes: [0, 1], data: ['foo', 'bar']};
-
-      var template = CompilerContext.compile(string);
-      var result = template(hash);
-
-      equal(result, '');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/compiler.js b/lib/handlebars/spec/compiler.js
deleted file mode 100644
index fe4b63a30..000000000
--- a/lib/handlebars/spec/compiler.js
+++ /dev/null
@@ -1,68 +0,0 @@
-describe('compiler', function() {
-  if (!Handlebars.compile) {
-    return;
-  }
-
-  describe('#equals', function() {
-    function compile(string) {
-      var ast = Handlebars.parse(string);
-      return new Handlebars.Compiler().compile(ast, {});
-    }
-
-    it('should treat as equal', function() {
-      equal(compile('foo').equals(compile('foo')), true);
-      equal(compile('{{foo}}').equals(compile('{{foo}}')), true);
-      equal(compile('{{foo.bar}}').equals(compile('{{foo.bar}}')), true);
-      equal(compile('{{foo.bar baz "foo" true false bat=1}}').equals(compile('{{foo.bar baz "foo" true false bat=1}}')), true);
-      equal(compile('{{foo.bar (baz bat=1)}}').equals(compile('{{foo.bar (baz bat=1)}}')), true);
-      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{/foo}}')), true);
-    });
-    it('should treat as not equal', function() {
-      equal(compile('foo').equals(compile('bar')), false);
-      equal(compile('{{foo}}').equals(compile('{{bar}}')), false);
-      equal(compile('{{foo.bar}}').equals(compile('{{bar.bar}}')), false);
-      equal(compile('{{foo.bar baz bat=1}}').equals(compile('{{foo.bar bar bat=1}}')), false);
-      equal(compile('{{foo.bar (baz bat=1)}}').equals(compile('{{foo.bar (bar bat=1)}}')), false);
-      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#bar}} {{/bar}}')), false);
-      equal(compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{foo}}{{/foo}}')), false);
-    });
-  });
-
-  describe('#compile', function() {
-    it('should fail with invalid input', function() {
-      shouldThrow(function() {
-        Handlebars.compile(null);
-      }, Error, 'You must pass a string or Handlebars AST to Handlebars.compile. You passed null');
-      shouldThrow(function() {
-        Handlebars.compile({});
-      }, Error, 'You must pass a string or Handlebars AST to Handlebars.compile. You passed [object Object]');
-    });
-
-    it('can utilize AST instance', function() {
-      equal(Handlebars.compile(new Handlebars.AST.Program([ new Handlebars.AST.ContentStatement('Hello')], null, {}))(), 'Hello');
-    });
-
-    it('can pass through an empty string', function() {
-      equal(Handlebars.compile('')(), '');
-    });
-  });
-
-  describe('#precompile', function() {
-    it('should fail with invalid input', function() {
-      shouldThrow(function() {
-        Handlebars.precompile(null);
-      }, Error, 'You must pass a string or Handlebars AST to Handlebars.precompile. You passed null');
-      shouldThrow(function() {
-        Handlebars.precompile({});
-      }, Error, 'You must pass a string or Handlebars AST to Handlebars.precompile. You passed [object Object]');
-    });
-
-    it('can utilize AST instance', function() {
-      equal(/return "Hello"/.test(Handlebars.precompile(new Handlebars.AST.Program([ new Handlebars.AST.ContentStatement('Hello')]), null, {})), true);
-    });
-
-    it('can pass through an empty string', function() {
-      equal(/return ""/.test(Handlebars.precompile('')), true);
-    });
-  });
-});
diff --git a/lib/handlebars/spec/data.js b/lib/handlebars/spec/data.js
deleted file mode 100644
index 547a2664e..000000000
--- a/lib/handlebars/spec/data.js
+++ /dev/null
@@ -1,271 +0,0 @@
-describe('data', function() {
-  it('passing in data to a compiled function that expects data - works with helpers', function() {
-    var template = CompilerContext.compile('{{hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.data.adjective + ' ' + this.noun;
-      }
-    };
-
-    var result = template({noun: 'cat'}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('happy cat', result, 'Data output by helper');
-  });
-
-  it('data can be looked up via @foo', function() {
-    var template = CompilerContext.compile('{{@hello}}');
-    var result = template({}, { data: { hello: 'hello' } });
-    equals('hello', result, '@foo retrieves template data');
-  });
-
-  it('deep @foo triggers automatic top-level data', function() {
-    var template = CompilerContext.compile('{{#let world="world"}}{{#if foo}}{{#if foo}}Hello {{@world}}{{/if}}{{/if}}{{/let}}');
-
-    var helpers = Handlebars.createFrame(handlebarsEnv.helpers);
-
-    helpers.let = function(options) {
-      var frame = Handlebars.createFrame(options.data);
-
-      for (var prop in options.hash) {
-        if (prop in options.hash) {
-          frame[prop] = options.hash[prop];
-        }
-      }
-      return options.fn(this, { data: frame });
-    };
-
-    var result = template({ foo: true }, { helpers: helpers });
-    equals('Hello world', result, 'Automatic data was triggered');
-  });
-
-  it('parameter data can be looked up via @foo', function() {
-    var template = CompilerContext.compile('{{hello @world}}');
-    var helpers = {
-      hello: function(noun) {
-        return 'Hello ' + noun;
-      }
-    };
-
-    var result = template({}, { helpers: helpers, data: { world: 'world' } });
-    equals('Hello world', result, '@foo as a parameter retrieves template data');
-  });
-
-  it('hash values can be looked up via @foo', function() {
-    var template = CompilerContext.compile('{{hello noun=@world}}');
-    var helpers = {
-      hello: function(options) {
-        return 'Hello ' + options.hash.noun;
-      }
-    };
-
-    var result = template({}, { helpers: helpers, data: { world: 'world' } });
-    equals('Hello world', result, '@foo as a parameter retrieves template data');
-  });
-
-  it('nested parameter data can be looked up via @foo.bar', function() {
-    var template = CompilerContext.compile('{{hello @world.bar}}');
-    var helpers = {
-      hello: function(noun) {
-        return 'Hello ' + noun;
-      }
-    };
-
-    var result = template({}, { helpers: helpers, data: { world: {bar: 'world' } } });
-    equals('Hello world', result, '@foo as a parameter retrieves template data');
-  });
-
-  it('nested parameter data does not fail with @world.bar', function() {
-    var template = CompilerContext.compile('{{hello @world.bar}}');
-    var helpers = {
-      hello: function(noun) {
-        return 'Hello ' + noun;
-      }
-    };
-
-    var result = template({}, { helpers: helpers, data: { foo: {bar: 'world' } } });
-    equals('Hello undefined', result, '@foo as a parameter retrieves template data');
-  });
-
-  it('parameter data throws when using complex scope references', function() {
-    var string = '{{#goodbyes}}{{text}} cruel {{@foo/../name}}! {{/goodbyes}}';
-
-    shouldThrow(function() {
-      CompilerContext.compile(string);
-    }, Error);
-  });
-
-  it('data can be functions', function() {
-    var template = CompilerContext.compile('{{@hello}}');
-    var result = template({}, { data: { hello: function() { return 'hello'; } } });
-    equals('hello', result);
-  });
-  it('data can be functions with params', function() {
-    var template = CompilerContext.compile('{{@hello "hello"}}');
-    var result = template({}, { data: { hello: function(arg) { return arg; } } });
-    equals('hello', result);
-  });
-
-  it('data is inherited downstream', function() {
-    var template = CompilerContext.compile('{{#let foo=1 bar=2}}{{#let foo=bar.baz}}{{@bar}}{{@foo}}{{/let}}{{@foo}}{{/let}}', { data: true });
-    var helpers = {
-      let: function(options) {
-        var frame = Handlebars.createFrame(options.data);
-        for (var prop in options.hash) {
-          if (prop in options.hash) {
-            frame[prop] = options.hash[prop];
-          }
-        }
-        return options.fn(this, {data: frame});
-      }
-    };
-
-    var result = template({ bar: { baz: 'hello world' } }, { helpers: helpers, data: {} });
-    equals('2hello world1', result, 'data variables are inherited downstream');
-  });
-
-  it('passing in data to a compiled function that expects data - works with helpers in partials', function() {
-    var template = CompilerContext.compile('{{>myPartial}}', {data: true});
-
-    var partials = {
-      myPartial: CompilerContext.compile('{{hello}}', {data: true})
-    };
-
-    var helpers = {
-      hello: function(options) {
-        return options.data.adjective + ' ' + this.noun;
-      }
-    };
-
-    var result = template({noun: 'cat'}, {helpers: helpers, partials: partials, data: {adjective: 'happy'}});
-    equals('happy cat', result, 'Data output by helper inside partial');
-  });
-
-  it('passing in data to a compiled function that expects data - works with helpers and parameters', function() {
-    var template = CompilerContext.compile('{{hello world}}', {data: true});
-
-    var helpers = {
-      hello: function(noun, options) {
-        return options.data.adjective + ' ' + noun + (this.exclaim ? '!' : '');
-      }
-    };
-
-    var result = template({exclaim: true, world: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('happy world!', result, 'Data output by helper');
-  });
-
-  it('passing in data to a compiled function that expects data - works with block helpers', function() {
-    var template = CompilerContext.compile('{{#hello}}{{world}}{{/hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.fn(this);
-      },
-      world: function(options) {
-        return options.data.adjective + ' world' + (this.exclaim ? '!' : '');
-      }
-    };
-
-    var result = template({exclaim: true}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('happy world!', result, 'Data output by helper');
-  });
-
-  it('passing in data to a compiled function that expects data - works with block helpers that use ..', function() {
-    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.fn({exclaim: '?'});
-      },
-      world: function(thing, options) {
-        return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      }
-    };
-
-    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('happy world?', result, 'Data output by helper');
-  });
-
-  it('passing in data to a compiled function that expects data - data is passed to with block helpers where children use ..', function() {
-    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.data.accessData + ' ' + options.fn({exclaim: '?'});
-      },
-      world: function(thing, options) {
-        return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      }
-    };
-
-    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy', accessData: '#win'}});
-    equals('#win happy world?', result, 'Data output by helper');
-  });
-
-  it('you can override inherited data when invoking a helper', function() {
-    var template = CompilerContext.compile('{{#hello}}{{world zomg}}{{/hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.fn({exclaim: '?', zomg: 'world'}, { data: {adjective: 'sad'} });
-      },
-      world: function(thing, options) {
-        return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      }
-    };
-
-    var result = template({exclaim: true, zomg: 'planet'}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('sad world?', result, 'Overriden data output by helper');
-  });
-
-
-  it('you can override inherited data when invoking a helper with depth', function() {
-    var template = CompilerContext.compile('{{#hello}}{{world ../zomg}}{{/hello}}', {data: true});
-
-    var helpers = {
-      hello: function(options) {
-        return options.fn({exclaim: '?'}, { data: {adjective: 'sad'} });
-      },
-      world: function(thing, options) {
-        return options.data.adjective + ' ' + thing + (this.exclaim || '');
-      }
-    };
-
-    var result = template({exclaim: true, zomg: 'world'}, {helpers: helpers, data: {adjective: 'happy'}});
-    equals('sad world?', result, 'Overriden data output by helper');
-  });
-
-  describe('@root', function() {
-    it('the root context can be looked up via @root', function() {
-      var template = CompilerContext.compile('{{@root.foo}}');
-      var result = template({foo: 'hello'}, { data: {} });
-      equals('hello', result);
-
-      result = template({foo: 'hello'}, {});
-      equals('hello', result);
-    });
-    it('passed root values take priority', function() {
-      var template = CompilerContext.compile('{{@root.foo}}');
-      var result = template({}, { data: {root: {foo: 'hello'} } });
-      equals('hello', result);
-    });
-  });
-
-  describe('nesting', function() {
-    it('the root context can be looked up via @root', function() {
-      var template = CompilerContext.compile('{{#helper}}{{#helper}}{{@./depth}} {{@../depth}} {{@../../depth}}{{/helper}}{{/helper}}');
-      var result = template({foo: 'hello'}, {
-        helpers: {
-          helper: function(options) {
-            var frame = Handlebars.createFrame(options.data);
-            frame.depth = options.data.depth + 1;
-            return options.fn(this, {data: frame});
-          }
-        },
-        data: {
-          depth: 0
-        }
-      });
-      equals('2 1 0', result);
-    });
-  });
-});
diff --git a/lib/handlebars/spec/env/browser.js b/lib/handlebars/spec/env/browser.js
deleted file mode 100644
index c9414d402..000000000
--- a/lib/handlebars/spec/env/browser.js
+++ /dev/null
@@ -1,30 +0,0 @@
-require('./common');
-
-var fs = require('fs'),
-    vm = require('vm');
-
-global.Handlebars = 'no-conflict';
-vm.runInThisContext(fs.readFileSync(__dirname + '/../../dist/handlebars.js'), 'dist/handlebars.js');
-
-global.CompilerContext = {
-  browser: true,
-
-  compile: function(template, options) {
-    var templateSpec = handlebarsEnv.precompile(template, options);
-    return handlebarsEnv.template(safeEval(templateSpec));
-  },
-  compileWithPartial: function(template, options) {
-    return handlebarsEnv.compile(template, options);
-  }
-};
-
-function safeEval(templateSpec) {
-  /*eslint-disable no-eval, no-console */
-  try {
-    return eval('(' + templateSpec + ')');
-  } catch (err) {
-    console.error(templateSpec);
-    throw err;
-  }
-  /*eslint-enable no-eval, no-console */
-}
diff --git a/lib/handlebars/spec/env/common.js b/lib/handlebars/spec/env/common.js
deleted file mode 100644
index e4c8ae537..000000000
--- a/lib/handlebars/spec/env/common.js
+++ /dev/null
@@ -1,56 +0,0 @@
-global.shouldCompileTo = function(string, hashOrArray, expected, message) {
-  shouldCompileToWithPartials(string, hashOrArray, false, expected, message);
-};
-
-global.shouldCompileToWithPartials = function(string, hashOrArray, partials, expected, message) {
-  var result = compileWithPartials(string, hashOrArray, partials);
-  if (result !== expected) {
-    throw new Error("'" + result + "' should === '" + expected + "': " + message);
-  }
-};
-
-global.compileWithPartials = function(string, hashOrArray, partials) {
-  var template,
-      ary,
-      options;
-  if (Object.prototype.toString.call(hashOrArray) === '[object Array]') {
-    ary = [];
-    ary.push(hashOrArray[0]);
-    ary.push({ helpers: hashOrArray[1], partials: hashOrArray[2] });
-    options = typeof hashOrArray[3] === 'object' ? hashOrArray[3] : {compat: hashOrArray[3]};
-    if (hashOrArray[4] != null) {
-      options.data = !!hashOrArray[4];
-      ary[1].data = hashOrArray[4];
-    }
-  } else {
-    ary = [hashOrArray];
-  }
-
-  template = CompilerContext[partials ? 'compileWithPartial' : 'compile'](string, options);
-  return template.apply(this, ary);
-};
-
-
-global.equals = global.equal = function(a, b, msg) {
-  if (a !== b) {
-    throw new Error("'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''));
-  }
-};
-
-global.shouldThrow = function(callback, type, msg) {
-  var failed;
-  try {
-    callback();
-    failed = true;
-  } catch (err) {
-    if (type && !(err instanceof type)) {
-      throw new Error('Type failure: ' + err);
-    }
-    if (msg && !(msg.test ? msg.test(err.message) : msg === err.message)) {
-      equal(msg, err.message);
-    }
-  }
-  if (failed) {
-    throw new Error('It failed to throw');
-  }
-};
diff --git a/lib/handlebars/spec/env/json2.js b/lib/handlebars/spec/env/json2.js
deleted file mode 100644
index deb88ec9a..000000000
--- a/lib/handlebars/spec/env/json2.js
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
-    json2.js
-    2014-02-04
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-
-
-    This file creates a global JSON object containing two methods: stringify
-    and parse.
-
-        JSON.stringify(value, replacer, space)
-            value       any JavaScript value, usually an object or array.
-
-            replacer    an optional parameter that determines how object
-                        values are stringified for objects. It can be a
-                        function or an array of strings.
-
-            space       an optional parameter that specifies the indentation
-                        of nested structures. If it is omitted, the text will
-                        be packed without extra whitespace. If it is a number,
-                        it will specify the number of spaces to indent at each
-                        level. If it is a string (such as '\t' or '&nbsp;'),
-                        it contains the characters used to indent at each level.
-
-            This method produces a JSON text from a JavaScript value.
-
-            When an object value is found, if the object contains a toJSON
-            method, its toJSON method will be called and the result will be
-            stringified. A toJSON method does not serialize: it returns the
-            value represented by the name/value pair that should be serialized,
-            or undefined if nothing should be serialized. The toJSON method
-            will be passed the key associated with the value, and this will be
-            bound to the value
-
-            For example, this would serialize Dates as ISO strings.
-
-                Date.prototype.toJSON = function (key) {
-                    function f(n) {
-                        // Format integers to have at least two digits.
-                        return n < 10 ? '0' + n : n;
-                    }
-
-                    return this.getUTCFullYear()   + '-' +
-                         f(this.getUTCMonth() + 1) + '-' +
-                         f(this.getUTCDate())      + 'T' +
-                         f(this.getUTCHours())     + ':' +
-                         f(this.getUTCMinutes())   + ':' +
-                         f(this.getUTCSeconds())   + 'Z';
-                };
-
-            You can provide an optional replacer method. It will be passed the
-            key and value of each member, with this bound to the containing
-            object. The value that is returned from your method will be
-            serialized. If your method returns undefined, then the member will
-            be excluded from the serialization.
-
-            If the replacer parameter is an array of strings, then it will be
-            used to select the members to be serialized. It filters the results
-            such that only members with keys listed in the replacer array are
-            stringified.
-
-            Values that do not have JSON representations, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped; in arrays they will be replaced with null. You can use
-            a replacer function to replace those with JSON values.
-            JSON.stringify(undefined) returns undefined.
-
-            The optional space parameter produces a stringification of the
-            value that is filled with line breaks and indentation to make it
-            easier to read.
-
-            If the space parameter is a non-empty string, then that string will
-            be used for indentation. If the space parameter is a number, then
-            the indentation will be that many spaces.
-
-            Example:
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
-            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
-            text = JSON.stringify([new Date()], function (key, value) {
-                return this[key] instanceof Date ?
-                    'Date(' + this[key] + ')' : value;
-            });
-            // text is '["Date(---current time---)"]'
-
-
-        JSON.parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = JSON.parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
-                var d;
-                if (typeof value === 'string' &&
-                        value.slice(0, 5) === 'Date(' &&
-                        value.slice(-1) === ')') {
-                    d = new Date(value.slice(5, -1));
-                    if (d) {
-                        return d;
-                    }
-                }
-                return value;
-            });
-
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-*/
-
-/*jslint evil: true, regexp: true */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
-    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
-    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
-    lastIndex, length, parse, prototype, push, replace, slice, stringify,
-    test, toJSON, toString, valueOf
-*/
-
-
-// Create a JSON object only if one does not already exist. We create the
-// methods in a closure to avoid creating global variables.
-
-if (typeof JSON !== 'object') {
-    JSON = {};
-}
-
-(function () {
-    'use strict';
-
-    function f(n) {
-        // Format integers to have at least two digits.
-        return n < 10 ? '0' + n : n;
-    }
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-
-        Date.prototype.toJSON = function () {
-
-            return isFinite(this.valueOf())
-                ? this.getUTCFullYear()     + '-' +
-                    f(this.getUTCMonth() + 1) + '-' +
-                    f(this.getUTCDate())      + 'T' +
-                    f(this.getUTCHours())     + ':' +
-                    f(this.getUTCMinutes())   + ':' +
-                    f(this.getUTCSeconds())   + 'Z'
-                : null;
-        };
-
-        String.prototype.toJSON      =
-            Number.prototype.toJSON  =
-            Boolean.prototype.toJSON = function () {
-                return this.valueOf();
-            };
-    }
-
-    var cx,
-        escapable,
-        gap,
-        indent,
-        meta,
-        rep;
-
-
-    function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-        escapable.lastIndex = 0;
-        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
-            var c = meta[a];
-            return typeof c === 'string'
-                ? c
-                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-        }) + '"' : '"' + string + '"';
-    }
-
-
-    function str(key, holder) {
-
-// Produce a string from holder[key].
-
-        var i,          // The loop counter.
-            k,          // The member key.
-            v,          // The member value.
-            length,
-            mind = gap,
-            partial,
-            value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-        if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function') {
-            value = value.toJSON(key);
-        }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-        if (typeof rep === 'function') {
-            value = rep.call(holder, key, value);
-        }
-
-// What happens next depends on the value's type.
-
-        switch (typeof value) {
-        case 'string':
-            return quote(value);
-
-        case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-            return isFinite(value) ? String(value) : 'null';
-
-        case 'boolean':
-        case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-            return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-        case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-            if (!value) {
-                return 'null';
-            }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-            gap += indent;
-            partial = [];
-
-// Is the value an array?
-
-            if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                length = value.length;
-                for (i = 0; i < length; i += 1) {
-                    partial[i] = str(i, value) || 'null';
-                }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-                v = partial.length === 0
-                    ? '[]'
-                    : gap
-                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
-                    : '[' + partial.join(',') + ']';
-                gap = mind;
-                return v;
-            }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-            if (rep && typeof rep === 'object') {
-                length = rep.length;
-                for (i = 0; i < length; i += 1) {
-                    if (typeof rep[i] === 'string') {
-                        k = rep[i];
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                for (k in value) {
-                    if (Object.prototype.hasOwnProperty.call(value, k)) {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-            v = partial.length === 0
-                ? '{}'
-                : gap
-                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
-                : '{' + partial.join(',') + '}';
-            gap = mind;
-            return v;
-        }
-    }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
-    if (typeof JSON.stringify !== 'function') {
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        };
-        JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-            var i;
-            gap = '';
-            indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                    typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-            return str('', {'': value});
-        };
-    }
-
-
-// If the JSON object does not yet have a parse method, give it one.
-
-    if (typeof JSON.parse !== 'function') {
-        cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-        JSON.parse = function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
-            var j;
-
-            function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
-                var k, v, value = holder[key];
-                if (value && typeof value === 'object') {
-                    for (k in value) {
-                        if (Object.prototype.hasOwnProperty.call(value, k)) {
-                            v = walk(value, k);
-                            if (v !== undefined) {
-                                value[k] = v;
-                            } else {
-                                delete value[k];
-                            }
-                        }
-                    }
-                }
-                return reviver.call(holder, key, value);
-            }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
-            text = String(text);
-            cx.lastIndex = 0;
-            if (cx.test(text)) {
-                text = text.replace(cx, function (a) {
-                    return '\\u' +
-                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-                });
-            }
-
-// In the second stage, we run the text against regular expressions that look
-// for non-JSON patterns. We are especially concerned with '()' and 'new'
-// because they can cause invocation, and '=' because it can cause mutation.
-// But just to be safe, we want to reject all unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-            if (/^[\],:{}\s]*$/
-                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
-                return typeof reviver === 'function'
-                    ? walk({'': j}, '')
-                    : j;
-            }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-            throw new SyntaxError('JSON.parse');
-        };
-    }
-}());
diff --git a/lib/handlebars/spec/env/node.js b/lib/handlebars/spec/env/node.js
deleted file mode 100644
index 62d9fe9b6..000000000
--- a/lib/handlebars/spec/env/node.js
+++ /dev/null
@@ -1,24 +0,0 @@
-require('./common');
-
-global.Handlebars = require('../../lib');
-
-global.CompilerContext = {
-  compile: function(template, options) {
-    var templateSpec = handlebarsEnv.precompile(template, options);
-    return handlebarsEnv.template(safeEval(templateSpec));
-  },
-  compileWithPartial: function(template, options) {
-    return handlebarsEnv.compile(template, options);
-  }
-};
-
-function safeEval(templateSpec) {
-  /*eslint-disable no-eval, no-console */
-  try {
-    return eval('(' + templateSpec + ')');
-  } catch (err) {
-    console.error(templateSpec);
-    throw err;
-  }
-  /*eslint-enable no-eval, no-console */
-}
diff --git a/lib/handlebars/spec/env/require.js b/lib/handlebars/spec/env/require.js
deleted file mode 100644
index 2ce09b5e3..000000000
--- a/lib/handlebars/spec/env/require.js
+++ /dev/null
@@ -1,2054 +0,0 @@
-/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.9 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
- */
-//Not using strict: uneven strict support in browsers, #392, and causes
-//problems with requirejs.exec()/transpiler plugins that may not be strict.
-/*jslint regexp: true, nomen: true, sloppy: true */
-/*global window, navigator, document, importScripts, setTimeout, opera */
-
-var requirejs, require, define;
-(function (global) {
-    var req, s, head, baseElement, dataMain, src,
-        interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.9',
-        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
-        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
-        jsSuffixRegExp = /\.js$/,
-        currDirRegExp = /^\.\//,
-        op = Object.prototype,
-        ostring = op.toString,
-        hasOwn = op.hasOwnProperty,
-        ap = Array.prototype,
-        apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
-        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
-        //PS3 indicates loaded and complete, but need to wait for complete
-        //specifically. Sequence is 'loading', 'loaded', execution,
-        // then 'complete'. The UA check is unfortunate, but not sure how
-        //to feature test w/o causing perf issues.
-        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
-                      /^complete$/ : /^(complete|loaded)$/,
-        defContextName = '_',
-        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
-        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
-        contexts = {},
-        cfg = {},
-        globalDefQueue = [],
-        useInteractive = false;
-
-    function isFunction(it) {
-        return ostring.call(it) === '[object Function]';
-    }
-
-    function isArray(it) {
-        return ostring.call(it) === '[object Array]';
-    }
-
-    /**
-     * Helper function for iterating over an array. If the func returns
-     * a true value, it will break out of the loop.
-     */
-    function each(ary, func) {
-        if (ary) {
-            var i;
-            for (i = 0; i < ary.length; i += 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Helper function for iterating over an array backwards. If the func
-     * returns a true value, it will break out of the loop.
-     */
-    function eachReverse(ary, func) {
-        if (ary) {
-            var i;
-            for (i = ary.length - 1; i > -1; i -= 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    function hasProp(obj, prop) {
-        return hasOwn.call(obj, prop);
-    }
-
-    function getOwn(obj, prop) {
-        return hasProp(obj, prop) && obj[prop];
-    }
-
-    /**
-     * Cycles over properties in an object and calls a function for each
-     * property value. If the function returns a truthy value, then the
-     * iteration is stopped.
-     */
-    function eachProp(obj, func) {
-        var prop;
-        for (prop in obj) {
-            if (hasProp(obj, prop)) {
-                if (func(obj[prop], prop)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Simple function to mix in properties from source into target,
-     * but only if target does not already have a property of the same name.
-     */
-    function mixin(target, source, force, deepStringMixin) {
-        if (source) {
-            eachProp(source, function (value, prop) {
-                if (force || !hasProp(target, prop)) {
-                    if (deepStringMixin && typeof value !== 'string') {
-                        if (!target[prop]) {
-                            target[prop] = {};
-                        }
-                        mixin(target[prop], value, force, deepStringMixin);
-                    } else {
-                        target[prop] = value;
-                    }
-                }
-            });
-        }
-        return target;
-    }
-
-    //Similar to Function.prototype.bind, but the 'this' object is specified
-    //first, since it is easier to read/figure out what 'this' will be.
-    function bind(obj, fn) {
-        return function () {
-            return fn.apply(obj, arguments);
-        };
-    }
-
-    function scripts() {
-        return document.getElementsByTagName('script');
-    }
-
-    function defaultOnError(err) {
-        throw err;
-    }
-
-    //Allow getting a global that expressed in
-    //dot notation, like 'a.b.c'.
-    function getGlobal(value) {
-        if (!value) {
-            return value;
-        }
-        var g = global;
-        each(value.split('.'), function (part) {
-            g = g[part];
-        });
-        return g;
-    }
-
-    /**
-     * Constructs an error with a pointer to an URL with more information.
-     * @param {String} id the error ID that maps to an ID on a web page.
-     * @param {String} message human readable error.
-     * @param {Error} [err] the original error, if there is one.
-     *
-     * @returns {Error}
-     */
-    function makeError(id, msg, err, requireModules) {
-        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
-        e.requireType = id;
-        e.requireModules = requireModules;
-        if (err) {
-            e.originalError = err;
-        }
-        return e;
-    }
-
-    if (typeof define !== 'undefined') {
-        //If a define is already in play via another AMD loader,
-        //do not overwrite.
-        return;
-    }
-
-    if (typeof requirejs !== 'undefined') {
-        if (isFunction(requirejs)) {
-            //Do not overwrite and existing requirejs instance.
-            return;
-        }
-        cfg = requirejs;
-        requirejs = undefined;
-    }
-
-    //Allow for a require config object
-    if (typeof require !== 'undefined' && !isFunction(require)) {
-        //assume it is a config object.
-        cfg = require;
-        require = undefined;
-    }
-
-    function newContext(contextName) {
-        var inCheckLoaded, Module, context, handlers,
-            checkLoadedTimeoutId,
-            config = {
-                //Defaults. Do not set a default for map
-                //config to speed up normalize(), which
-                //will run faster if there is no default.
-                waitSeconds: 7,
-                baseUrl: './',
-                paths: {},
-                pkgs: {},
-                shim: {},
-                config: {}
-            },
-            registry = {},
-            //registry of just enabled modules, to speed
-            //cycle breaking code when lots of modules
-            //are registered, but not activated.
-            enabledRegistry = {},
-            undefEvents = {},
-            defQueue = [],
-            defined = {},
-            urlFetched = {},
-            requireCounter = 1,
-            unnormalizedCounter = 1;
-
-        /**
-         * Trims the . and .. from an array of path segments.
-         * It will keep a leading path segment if a .. will become
-         * the first path segment, to help with module name lookups,
-         * which act like paths, but can be remapped. But the end result,
-         * all paths that use this function should look normalized.
-         * NOTE: this method MODIFIES the input array.
-         * @param {Array} ary the array of path segments.
-         */
-        function trimDots(ary) {
-            var i, part;
-            for (i = 0; ary[i]; i += 1) {
-                part = ary[i];
-                if (part === '.') {
-                    ary.splice(i, 1);
-                    i -= 1;
-                } else if (part === '..') {
-                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
-                        //End of the line. Keep at least one non-dot
-                        //path segment at the front so it can be mapped
-                        //correctly to disk. Otherwise, there is likely
-                        //no path mapping for a path starting with '..'.
-                        //This can still fail, but catches the most reasonable
-                        //uses of ..
-                        break;
-                    } else if (i > 0) {
-                        ary.splice(i - 1, 2);
-                        i -= 2;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Given a relative module name, like ./something, normalize it to
-         * a real name that can be mapped to a path.
-         * @param {String} name the relative name
-         * @param {String} baseName a real name that the name arg is relative
-         * to.
-         * @param {Boolean} applyMap apply the map config to the value. Should
-         * only be done if this normalization is for a dependency ID.
-         * @returns {String} normalized name
-         */
-        function normalize(name, baseName, applyMap) {
-            var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
-                foundMap, foundI, foundStarMap, starI,
-                baseParts = baseName && baseName.split('/'),
-                normalizedBaseParts = baseParts,
-                map = config.map,
-                starMap = map && map['*'];
-
-            //Adjust any relative paths.
-            if (name && name.charAt(0) === '.') {
-                //If have a base name, try to normalize against it,
-                //otherwise, assume it is a top-level require that will
-                //be relative to baseUrl in the end.
-                if (baseName) {
-                    if (getOwn(config.pkgs, baseName)) {
-                        //If the baseName is a package name, then just treat it as one
-                        //name to concat the name with.
-                        normalizedBaseParts = baseParts = [baseName];
-                    } else {
-                        //Convert baseName to array, and lop off the last part,
-                        //so that . matches that 'directory' and not name of the baseName's
-                        //module. For instance, baseName of 'one/two/three', maps to
-                        //'one/two/three.js', but we want the directory, 'one/two' for
-                        //this normalization.
-                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    }
-
-                    name = normalizedBaseParts.concat(name.split('/'));
-                    trimDots(name);
-
-                    //Some use of packages may use a . path to reference the
-                    //'main' module name, so normalize for that.
-                    pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
-                    name = name.join('/');
-                    if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
-                        name = pkgName;
-                    }
-                } else if (name.indexOf('./') === 0) {
-                    // No baseName, so this is ID is resolved relative
-                    // to baseUrl, pull off the leading dot.
-                    name = name.substring(2);
-                }
-            }
-
-            //Apply map config if available.
-            if (applyMap && map && (baseParts || starMap)) {
-                nameParts = name.split('/');
-
-                for (i = nameParts.length; i > 0; i -= 1) {
-                    nameSegment = nameParts.slice(0, i).join('/');
-
-                    if (baseParts) {
-                        //Find the longest baseName segment match in the config.
-                        //So, do joins on the biggest to smallest lengths of baseParts.
-                        for (j = baseParts.length; j > 0; j -= 1) {
-                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
-
-                            //baseName segment has config, find if it has one for
-                            //this name.
-                            if (mapValue) {
-                                mapValue = getOwn(mapValue, nameSegment);
-                                if (mapValue) {
-                                    //Match, update name to the new value.
-                                    foundMap = mapValue;
-                                    foundI = i;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if (foundMap) {
-                        break;
-                    }
-
-                    //Check for a star map match, but just hold on to it,
-                    //if there is a shorter segment match later in a matching
-                    //config, then favor over this star map.
-                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
-                        foundStarMap = getOwn(starMap, nameSegment);
-                        starI = i;
-                    }
-                }
-
-                if (!foundMap && foundStarMap) {
-                    foundMap = foundStarMap;
-                    foundI = starI;
-                }
-
-                if (foundMap) {
-                    nameParts.splice(0, foundI, foundMap);
-                    name = nameParts.join('/');
-                }
-            }
-
-            return name;
-        }
-
-        function removeScript(name) {
-            if (isBrowser) {
-                each(scripts(), function (scriptNode) {
-                    if (scriptNode.getAttribute('data-requiremodule') === name &&
-                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
-                        scriptNode.parentNode.removeChild(scriptNode);
-                        return true;
-                    }
-                });
-            }
-        }
-
-        function hasPathFallback(id) {
-            var pathConfig = getOwn(config.paths, id);
-            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
-                //Pop off the first array value, since it failed, and
-                //retry
-                pathConfig.shift();
-                context.require.undef(id);
-                context.require([id]);
-                return true;
-            }
-        }
-
-        //Turns a plugin!resource to [plugin, resource]
-        //with the plugin being undefined if the name
-        //did not have a plugin prefix.
-        function splitPrefix(name) {
-            var prefix,
-                index = name ? name.indexOf('!') : -1;
-            if (index > -1) {
-                prefix = name.substring(0, index);
-                name = name.substring(index + 1, name.length);
-            }
-            return [prefix, name];
-        }
-
-        /**
-         * Creates a module mapping that includes plugin prefix, module
-         * name, and path. If parentModuleMap is provided it will
-         * also normalize the name via require.normalize()
-         *
-         * @param {String} name the module name
-         * @param {String} [parentModuleMap] parent module map
-         * for the module name, used to resolve relative names.
-         * @param {Boolean} isNormalized: is the ID already normalized.
-         * This is true if this call is done for a define() module ID.
-         * @param {Boolean} applyMap: apply the map config to the ID.
-         * Should only be true if this map is for a dependency.
-         *
-         * @returns {Object}
-         */
-        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
-            var url, pluginModule, suffix, nameParts,
-                prefix = null,
-                parentName = parentModuleMap ? parentModuleMap.name : null,
-                originalName = name,
-                isDefine = true,
-                normalizedName = '';
-
-            //If no name, then it means it is a require call, generate an
-            //internal name.
-            if (!name) {
-                isDefine = false;
-                name = '_@r' + (requireCounter += 1);
-            }
-
-            nameParts = splitPrefix(name);
-            prefix = nameParts[0];
-            name = nameParts[1];
-
-            if (prefix) {
-                prefix = normalize(prefix, parentName, applyMap);
-                pluginModule = getOwn(defined, prefix);
-            }
-
-            //Account for relative paths if there is a base name.
-            if (name) {
-                if (prefix) {
-                    if (pluginModule && pluginModule.normalize) {
-                        //Plugin is loaded, use its normalize method.
-                        normalizedName = pluginModule.normalize(name, function (name) {
-                            return normalize(name, parentName, applyMap);
-                        });
-                    } else {
-                        normalizedName = normalize(name, parentName, applyMap);
-                    }
-                } else {
-                    //A regular module.
-                    normalizedName = normalize(name, parentName, applyMap);
-
-                    //Normalized name may be a plugin ID due to map config
-                    //application in normalize. The map config values must
-                    //already be normalized, so do not need to redo that part.
-                    nameParts = splitPrefix(normalizedName);
-                    prefix = nameParts[0];
-                    normalizedName = nameParts[1];
-                    isNormalized = true;
-
-                    url = context.nameToUrl(normalizedName);
-                }
-            }
-
-            //If the id is a plugin id that cannot be determined if it needs
-            //normalization, stamp it with a unique ID so two matching relative
-            //ids that may conflict can be separate.
-            suffix = prefix && !pluginModule && !isNormalized ?
-                     '_unnormalized' + (unnormalizedCounter += 1) :
-                     '';
-
-            return {
-                prefix: prefix,
-                name: normalizedName,
-                parentMap: parentModuleMap,
-                unnormalized: !!suffix,
-                url: url,
-                originalName: originalName,
-                isDefine: isDefine,
-                id: (prefix ?
-                        prefix + '!' + normalizedName :
-                        normalizedName) + suffix
-            };
-        }
-
-        function getModule(depMap) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
-
-            if (!mod) {
-                mod = registry[id] = new context.Module(depMap);
-            }
-
-            return mod;
-        }
-
-        function on(depMap, name, fn) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
-
-            if (hasProp(defined, id) &&
-                    (!mod || mod.defineEmitComplete)) {
-                if (name === 'defined') {
-                    fn(defined[id]);
-                }
-            } else {
-                mod = getModule(depMap);
-                if (mod.error && name === 'error') {
-                    fn(mod.error);
-                } else {
-                    mod.on(name, fn);
-                }
-            }
-        }
-
-        function onError(err, errback) {
-            var ids = err.requireModules,
-                notified = false;
-
-            if (errback) {
-                errback(err);
-            } else {
-                each(ids, function (id) {
-                    var mod = getOwn(registry, id);
-                    if (mod) {
-                        //Set error on module, so it skips timeout checks.
-                        mod.error = err;
-                        if (mod.events.error) {
-                            notified = true;
-                            mod.emit('error', err);
-                        }
-                    }
-                });
-
-                if (!notified) {
-                    req.onError(err);
-                }
-            }
-        }
-
-        /**
-         * Internal method to transfer globalQueue items to this context's
-         * defQueue.
-         */
-        function takeGlobalQueue() {
-            //Push all the globalDefQueue items into the context's defQueue
-            if (globalDefQueue.length) {
-                //Array splice in the values since the context code has a
-                //local var ref to defQueue, so cannot just reassign the one
-                //on context.
-                apsp.apply(defQueue,
-                           [defQueue.length - 1, 0].concat(globalDefQueue));
-                globalDefQueue = [];
-            }
-        }
-
-        handlers = {
-            'require': function (mod) {
-                if (mod.require) {
-                    return mod.require;
-                } else {
-                    return (mod.require = context.makeRequire(mod.map));
-                }
-            },
-            'exports': function (mod) {
-                mod.usingExports = true;
-                if (mod.map.isDefine) {
-                    if (mod.exports) {
-                        return mod.exports;
-                    } else {
-                        return (mod.exports = defined[mod.map.id] = {});
-                    }
-                }
-            },
-            'module': function (mod) {
-                if (mod.module) {
-                    return mod.module;
-                } else {
-                    return (mod.module = {
-                        id: mod.map.id,
-                        uri: mod.map.url,
-                        config: function () {
-                            var c,
-                                pkg = getOwn(config.pkgs, mod.map.id);
-                            // For packages, only support config targeted
-                            // at the main module.
-                            c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
-                                      getOwn(config.config, mod.map.id);
-                            return  c || {};
-                        },
-                        exports: defined[mod.map.id]
-                    });
-                }
-            }
-        };
-
-        function cleanRegistry(id) {
-            //Clean up machinery used for waiting modules.
-            delete registry[id];
-            delete enabledRegistry[id];
-        }
-
-        function breakCycle(mod, traced, processed) {
-            var id = mod.map.id;
-
-            if (mod.error) {
-                mod.emit('error', mod.error);
-            } else {
-                traced[id] = true;
-                each(mod.depMaps, function (depMap, i) {
-                    var depId = depMap.id,
-                        dep = getOwn(registry, depId);
-
-                    //Only force things that have not completed
-                    //being defined, so still in the registry,
-                    //and only if it has not been matched up
-                    //in the module already.
-                    if (dep && !mod.depMatched[i] && !processed[depId]) {
-                        if (getOwn(traced, depId)) {
-                            mod.defineDep(i, defined[depId]);
-                            mod.check(); //pass false?
-                        } else {
-                            breakCycle(dep, traced, processed);
-                        }
-                    }
-                });
-                processed[id] = true;
-            }
-        }
-
-        function checkLoaded() {
-            var map, modId, err, usingPathFallback,
-                waitInterval = config.waitSeconds * 1000,
-                //It is possible to disable the wait interval by using waitSeconds of 0.
-                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
-                noLoads = [],
-                reqCalls = [],
-                stillLoading = false,
-                needCycleCheck = true;
-
-            //Do not bother if this call was a result of a cycle break.
-            if (inCheckLoaded) {
-                return;
-            }
-
-            inCheckLoaded = true;
-
-            //Figure out the state of all the modules.
-            eachProp(enabledRegistry, function (mod) {
-                map = mod.map;
-                modId = map.id;
-
-                //Skip things that are not enabled or in error state.
-                if (!mod.enabled) {
-                    return;
-                }
-
-                if (!map.isDefine) {
-                    reqCalls.push(mod);
-                }
-
-                if (!mod.error) {
-                    //If the module should be executed, and it has not
-                    //been inited and time is up, remember it.
-                    if (!mod.inited && expired) {
-                        if (hasPathFallback(modId)) {
-                            usingPathFallback = true;
-                            stillLoading = true;
-                        } else {
-                            noLoads.push(modId);
-                            removeScript(modId);
-                        }
-                    } else if (!mod.inited && mod.fetched && map.isDefine) {
-                        stillLoading = true;
-                        if (!map.prefix) {
-                            //No reason to keep looking for unfinished
-                            //loading. If the only stillLoading is a
-                            //plugin resource though, keep going,
-                            //because it may be that a plugin resource
-                            //is waiting on a non-plugin cycle.
-                            return (needCycleCheck = false);
-                        }
-                    }
-                }
-            });
-
-            if (expired && noLoads.length) {
-                //If wait time expired, throw error of unloaded modules.
-                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
-                err.contextName = context.contextName;
-                return onError(err);
-            }
-
-            //Not expired, check for a cycle.
-            if (needCycleCheck) {
-                each(reqCalls, function (mod) {
-                    breakCycle(mod, {}, {});
-                });
-            }
-
-            //If still waiting on loads, and the waiting load is something
-            //other than a plugin resource, or there are still outstanding
-            //scripts, then just try back later.
-            if ((!expired || usingPathFallback) && stillLoading) {
-                //Something is still waiting to load. Wait for it, but only
-                //if a timeout is not already in effect.
-                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
-                    checkLoadedTimeoutId = setTimeout(function () {
-                        checkLoadedTimeoutId = 0;
-                        checkLoaded();
-                    }, 50);
-                }
-            }
-
-            inCheckLoaded = false;
-        }
-
-        Module = function (map) {
-            this.events = getOwn(undefEvents, map.id) || {};
-            this.map = map;
-            this.shim = getOwn(config.shim, map.id);
-            this.depExports = [];
-            this.depMaps = [];
-            this.depMatched = [];
-            this.pluginMaps = {};
-            this.depCount = 0;
-
-            /* this.exports this.factory
-               this.depMaps = [],
-               this.enabled, this.fetched
-            */
-        };
-
-        Module.prototype = {
-            init: function (depMaps, factory, errback, options) {
-                options = options || {};
-
-                //Do not do more inits if already done. Can happen if there
-                //are multiple define calls for the same module. That is not
-                //a normal, common case, but it is also not unexpected.
-                if (this.inited) {
-                    return;
-                }
-
-                this.factory = factory;
-
-                if (errback) {
-                    //Register for errors on this module.
-                    this.on('error', errback);
-                } else if (this.events.error) {
-                    //If no errback already, but there are error listeners
-                    //on this module, set up an errback to pass to the deps.
-                    errback = bind(this, function (err) {
-                        this.emit('error', err);
-                    });
-                }
-
-                //Do a copy of the dependency array, so that
-                //source inputs are not modified. For example
-                //"shim" deps are passed in here directly, and
-                //doing a direct modification of the depMaps array
-                //would affect that config.
-                this.depMaps = depMaps && depMaps.slice(0);
-
-                this.errback = errback;
-
-                //Indicate this module has be initialized
-                this.inited = true;
-
-                this.ignore = options.ignore;
-
-                //Could have option to init this module in enabled mode,
-                //or could have been previously marked as enabled. However,
-                //the dependencies are not known until init is called. So
-                //if enabled previously, now trigger dependencies as enabled.
-                if (options.enabled || this.enabled) {
-                    //Enable this module and dependencies.
-                    //Will call this.check()
-                    this.enable();
-                } else {
-                    this.check();
-                }
-            },
-
-            defineDep: function (i, depExports) {
-                //Because of cycles, defined callback for a given
-                //export can be called more than once.
-                if (!this.depMatched[i]) {
-                    this.depMatched[i] = true;
-                    this.depCount -= 1;
-                    this.depExports[i] = depExports;
-                }
-            },
-
-            fetch: function () {
-                if (this.fetched) {
-                    return;
-                }
-                this.fetched = true;
-
-                context.startTime = (new Date()).getTime();
-
-                var map = this.map;
-
-                //If the manager is for a plugin managed resource,
-                //ask the plugin to load it now.
-                if (this.shim) {
-                    context.makeRequire(this.map, {
-                        enableBuildCallback: true
-                    })(this.shim.deps || [], bind(this, function () {
-                        return map.prefix ? this.callPlugin() : this.load();
-                    }));
-                } else {
-                    //Regular dependency.
-                    return map.prefix ? this.callPlugin() : this.load();
-                }
-            },
-
-            load: function () {
-                var url = this.map.url;
-
-                //Regular dependency.
-                if (!urlFetched[url]) {
-                    urlFetched[url] = true;
-                    context.load(this.map.id, url);
-                }
-            },
-
-            /**
-             * Checks if the module is ready to define itself, and if so,
-             * define it.
-             */
-            check: function () {
-                if (!this.enabled || this.enabling) {
-                    return;
-                }
-
-                var err, cjsModule,
-                    id = this.map.id,
-                    depExports = this.depExports,
-                    exports = this.exports,
-                    factory = this.factory;
-
-                if (!this.inited) {
-                    this.fetch();
-                } else if (this.error) {
-                    this.emit('error', this.error);
-                } else if (!this.defining) {
-                    //The factory could trigger another require call
-                    //that would result in checking this module to
-                    //define itself again. If already in the process
-                    //of doing that, skip this work.
-                    this.defining = true;
-
-                    if (this.depCount < 1 && !this.defined) {
-                        if (isFunction(factory)) {
-                            //If there is an error listener, favor passing
-                            //to that instead of throwing an error. However,
-                            //only do it for define()'d  modules. require
-                            //errbacks should not be called for failures in
-                            //their callbacks (#699). However if a global
-                            //onError is set, use that.
-                            if ((this.events.error && this.map.isDefine) ||
-                                req.onError !== defaultOnError) {
-                                try {
-                                    exports = context.execCb(id, factory, depExports, exports);
-                                } catch (e) {
-                                    err = e;
-                                }
-                            } else {
-                                exports = context.execCb(id, factory, depExports, exports);
-                            }
-
-                            if (this.map.isDefine) {
-                                //If setting exports via 'module' is in play,
-                                //favor that over return value and exports. After that,
-                                //favor a non-undefined return value over exports use.
-                                cjsModule = this.module;
-                                if (cjsModule &&
-                                        cjsModule.exports !== undefined &&
-                                        //Make sure it is not already the exports value
-                                        cjsModule.exports !== this.exports) {
-                                    exports = cjsModule.exports;
-                                } else if (exports === undefined && this.usingExports) {
-                                    //exports already set the defined value.
-                                    exports = this.exports;
-                                }
-                            }
-
-                            if (err) {
-                                err.requireMap = this.map;
-                                err.requireModules = this.map.isDefine ? [this.map.id] : null;
-                                err.requireType = this.map.isDefine ? 'define' : 'require';
-                                return onError((this.error = err));
-                            }
-
-                        } else {
-                            //Just a literal value
-                            exports = factory;
-                        }
-
-                        this.exports = exports;
-
-                        if (this.map.isDefine && !this.ignore) {
-                            defined[id] = exports;
-
-                            if (req.onResourceLoad) {
-                                req.onResourceLoad(context, this.map, this.depMaps);
-                            }
-                        }
-
-                        //Clean up
-                        cleanRegistry(id);
-
-                        this.defined = true;
-                    }
-
-                    //Finished the define stage. Allow calling check again
-                    //to allow define notifications below in the case of a
-                    //cycle.
-                    this.defining = false;
-
-                    if (this.defined && !this.defineEmitted) {
-                        this.defineEmitted = true;
-                        this.emit('defined', this.exports);
-                        this.defineEmitComplete = true;
-                    }
-
-                }
-            },
-
-            callPlugin: function () {
-                var map = this.map,
-                    id = map.id,
-                    //Map already normalized the prefix.
-                    pluginMap = makeModuleMap(map.prefix);
-
-                //Mark this as a dependency for this plugin, so it
-                //can be traced for cycles.
-                this.depMaps.push(pluginMap);
-
-                on(pluginMap, 'defined', bind(this, function (plugin) {
-                    var load, normalizedMap, normalizedMod,
-                        name = this.map.name,
-                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
-                        localRequire = context.makeRequire(map.parentMap, {
-                            enableBuildCallback: true
-                        });
-
-                    //If current map is not normalized, wait for that
-                    //normalized name to load instead of continuing.
-                    if (this.map.unnormalized) {
-                        //Normalize the ID if the plugin allows it.
-                        if (plugin.normalize) {
-                            name = plugin.normalize(name, function (name) {
-                                return normalize(name, parentName, true);
-                            }) || '';
-                        }
-
-                        //prefix and name should already be normalized, no need
-                        //for applying map config again either.
-                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
-                                                      this.map.parentMap);
-                        on(normalizedMap,
-                            'defined', bind(this, function (value) {
-                                this.init([], function () { return value; }, null, {
-                                    enabled: true,
-                                    ignore: true
-                                });
-                            }));
-
-                        normalizedMod = getOwn(registry, normalizedMap.id);
-                        if (normalizedMod) {
-                            //Mark this as a dependency for this plugin, so it
-                            //can be traced for cycles.
-                            this.depMaps.push(normalizedMap);
-
-                            if (this.events.error) {
-                                normalizedMod.on('error', bind(this, function (err) {
-                                    this.emit('error', err);
-                                }));
-                            }
-                            normalizedMod.enable();
-                        }
-
-                        return;
-                    }
-
-                    load = bind(this, function (value) {
-                        this.init([], function () { return value; }, null, {
-                            enabled: true
-                        });
-                    });
-
-                    load.error = bind(this, function (err) {
-                        this.inited = true;
-                        this.error = err;
-                        err.requireModules = [id];
-
-                        //Remove temp unnormalized modules for this module,
-                        //since they will never be resolved otherwise now.
-                        eachProp(registry, function (mod) {
-                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
-                                cleanRegistry(mod.map.id);
-                            }
-                        });
-
-                        onError(err);
-                    });
-
-                    //Allow plugins to load other code without having to know the
-                    //context or how to 'complete' the load.
-                    load.fromText = bind(this, function (text, textAlt) {
-                        /*jslint evil: true */
-                        var moduleName = map.name,
-                            moduleMap = makeModuleMap(moduleName),
-                            hasInteractive = useInteractive;
-
-                        //As of 2.1.0, support just passing the text, to reinforce
-                        //fromText only being called once per resource. Still
-                        //support old style of passing moduleName but discard
-                        //that moduleName in favor of the internal ref.
-                        if (textAlt) {
-                            text = textAlt;
-                        }
-
-                        //Turn off interactive script matching for IE for any define
-                        //calls in the text, then turn it back on at the end.
-                        if (hasInteractive) {
-                            useInteractive = false;
-                        }
-
-                        //Prime the system by creating a module instance for
-                        //it.
-                        getModule(moduleMap);
-
-                        //Transfer any config to this other module.
-                        if (hasProp(config.config, id)) {
-                            config.config[moduleName] = config.config[id];
-                        }
-
-                        try {
-                            req.exec(text);
-                        } catch (e) {
-                            return onError(makeError('fromtexteval',
-                                             'fromText eval for ' + id +
-                                            ' failed: ' + e,
-                                             e,
-                                             [id]));
-                        }
-
-                        if (hasInteractive) {
-                            useInteractive = true;
-                        }
-
-                        //Mark this as a dependency for the plugin
-                        //resource
-                        this.depMaps.push(moduleMap);
-
-                        //Support anonymous modules.
-                        context.completeLoad(moduleName);
-
-                        //Bind the value of that module to the value for this
-                        //resource ID.
-                        localRequire([moduleName], load);
-                    });
-
-                    //Use parentName here since the plugin's name is not reliable,
-                    //could be some weird string with no path that actually wants to
-                    //reference the parentName's path.
-                    plugin.load(map.name, localRequire, load, config);
-                }));
-
-                context.enable(pluginMap, this);
-                this.pluginMaps[pluginMap.id] = pluginMap;
-            },
-
-            enable: function () {
-                enabledRegistry[this.map.id] = this;
-                this.enabled = true;
-
-                //Set flag mentioning that the module is enabling,
-                //so that immediate calls to the defined callbacks
-                //for dependencies do not trigger inadvertent load
-                //with the depCount still being zero.
-                this.enabling = true;
-
-                //Enable each dependency
-                each(this.depMaps, bind(this, function (depMap, i) {
-                    var id, mod, handler;
-
-                    if (typeof depMap === 'string') {
-                        //Dependency needs to be converted to a depMap
-                        //and wired up to this module.
-                        depMap = makeModuleMap(depMap,
-                                               (this.map.isDefine ? this.map : this.map.parentMap),
-                                               false,
-                                               !this.skipMap);
-                        this.depMaps[i] = depMap;
-
-                        handler = getOwn(handlers, depMap.id);
-
-                        if (handler) {
-                            this.depExports[i] = handler(this);
-                            return;
-                        }
-
-                        this.depCount += 1;
-
-                        on(depMap, 'defined', bind(this, function (depExports) {
-                            this.defineDep(i, depExports);
-                            this.check();
-                        }));
-
-                        if (this.errback) {
-                            on(depMap, 'error', bind(this, this.errback));
-                        }
-                    }
-
-                    id = depMap.id;
-                    mod = registry[id];
-
-                    //Skip special modules like 'require', 'exports', 'module'
-                    //Also, don't call enable if it is already enabled,
-                    //important in circular dependency cases.
-                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
-                        context.enable(depMap, this);
-                    }
-                }));
-
-                //Enable each plugin that is used in
-                //a dependency
-                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
-                    var mod = getOwn(registry, pluginMap.id);
-                    if (mod && !mod.enabled) {
-                        context.enable(pluginMap, this);
-                    }
-                }));
-
-                this.enabling = false;
-
-                this.check();
-            },
-
-            on: function (name, cb) {
-                var cbs = this.events[name];
-                if (!cbs) {
-                    cbs = this.events[name] = [];
-                }
-                cbs.push(cb);
-            },
-
-            emit: function (name, evt) {
-                each(this.events[name], function (cb) {
-                    cb(evt);
-                });
-                if (name === 'error') {
-                    //Now that the error handler was triggered, remove
-                    //the listeners, since this broken Module instance
-                    //can stay around for a while in the registry.
-                    delete this.events[name];
-                }
-            }
-        };
-
-        function callGetModule(args) {
-            //Skip modules already defined.
-            if (!hasProp(defined, args[0])) {
-                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
-            }
-        }
-
-        function removeListener(node, func, name, ieName) {
-            //Favor detachEvent because of IE9
-            //issue, see attachEvent/addEventListener comment elsewhere
-            //in this file.
-            if (node.detachEvent && !isOpera) {
-                //Probably IE. If not it will throw an error, which will be
-                //useful to know.
-                if (ieName) {
-                    node.detachEvent(ieName, func);
-                }
-            } else {
-                node.removeEventListener(name, func, false);
-            }
-        }
-
-        /**
-         * Given an event from a script node, get the requirejs info from it,
-         * and then removes the event listeners on the node.
-         * @param {Event} evt
-         * @returns {Object}
-         */
-        function getScriptData(evt) {
-            //Using currentTarget instead of target for Firefox 2.0's sake. Not
-            //all old browsers will be supported, but this one was easy enough
-            //to support and still makes sense.
-            var node = evt.currentTarget || evt.srcElement;
-
-            //Remove the listeners once here.
-            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
-            removeListener(node, context.onScriptError, 'error');
-
-            return {
-                node: node,
-                id: node && node.getAttribute('data-requiremodule')
-            };
-        }
-
-        function intakeDefines() {
-            var args;
-
-            //Any defined modules in the global queue, intake them now.
-            takeGlobalQueue();
-
-            //Make sure any remaining defQueue items get properly processed.
-            while (defQueue.length) {
-                args = defQueue.shift();
-                if (args[0] === null) {
-                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
-                } else {
-                    //args are id, deps, factory. Should be normalized by the
-                    //define() function.
-                    callGetModule(args);
-                }
-            }
-        }
-
-        context = {
-            config: config,
-            contextName: contextName,
-            registry: registry,
-            defined: defined,
-            urlFetched: urlFetched,
-            defQueue: defQueue,
-            Module: Module,
-            makeModuleMap: makeModuleMap,
-            nextTick: req.nextTick,
-            onError: onError,
-
-            /**
-             * Set a configuration for the context.
-             * @param {Object} cfg config object to integrate.
-             */
-            configure: function (cfg) {
-                //Make sure the baseUrl ends in a slash.
-                if (cfg.baseUrl) {
-                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
-                        cfg.baseUrl += '/';
-                    }
-                }
-
-                //Save off the paths and packages since they require special processing,
-                //they are additive.
-                var pkgs = config.pkgs,
-                    shim = config.shim,
-                    objs = {
-                        paths: true,
-                        config: true,
-                        map: true
-                    };
-
-                eachProp(cfg, function (value, prop) {
-                    if (objs[prop]) {
-                        if (prop === 'map') {
-                            if (!config.map) {
-                                config.map = {};
-                            }
-                            mixin(config[prop], value, true, true);
-                        } else {
-                            mixin(config[prop], value, true);
-                        }
-                    } else {
-                        config[prop] = value;
-                    }
-                });
-
-                //Merge shim
-                if (cfg.shim) {
-                    eachProp(cfg.shim, function (value, id) {
-                        //Normalize the structure
-                        if (isArray(value)) {
-                            value = {
-                                deps: value
-                            };
-                        }
-                        if ((value.exports || value.init) && !value.exportsFn) {
-                            value.exportsFn = context.makeShimExports(value);
-                        }
-                        shim[id] = value;
-                    });
-                    config.shim = shim;
-                }
-
-                //Adjust packages if necessary.
-                if (cfg.packages) {
-                    each(cfg.packages, function (pkgObj) {
-                        var location;
-
-                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
-                        location = pkgObj.location;
-
-                        //Create a brand new object on pkgs, since currentPackages can
-                        //be passed in again, and config.pkgs is the internal transformed
-                        //state for all package configs.
-                        pkgs[pkgObj.name] = {
-                            name: pkgObj.name,
-                            location: location || pkgObj.name,
-                            //Remove leading dot in main, so main paths are normalized,
-                            //and remove any trailing .js, since different package
-                            //envs have different conventions: some use a module name,
-                            //some use a file name.
-                            main: (pkgObj.main || 'main')
-                                  .replace(currDirRegExp, '')
-                                  .replace(jsSuffixRegExp, '')
-                        };
-                    });
-
-                    //Done with modifications, assing packages back to context config
-                    config.pkgs = pkgs;
-                }
-
-                //If there are any "waiting to execute" modules in the registry,
-                //update the maps for them, since their info, like URLs to load,
-                //may have changed.
-                eachProp(registry, function (mod, id) {
-                    //If module already has init called, since it is too
-                    //late to modify them, and ignore unnormalized ones
-                    //since they are transient.
-                    if (!mod.inited && !mod.map.unnormalized) {
-                        mod.map = makeModuleMap(id);
-                    }
-                });
-
-                //If a deps array or a config callback is specified, then call
-                //require with those args. This is useful when require is defined as a
-                //config object before require.js is loaded.
-                if (cfg.deps || cfg.callback) {
-                    context.require(cfg.deps || [], cfg.callback);
-                }
-            },
-
-            makeShimExports: function (value) {
-                function fn() {
-                    var ret;
-                    if (value.init) {
-                        ret = value.init.apply(global, arguments);
-                    }
-                    return ret || (value.exports && getGlobal(value.exports));
-                }
-                return fn;
-            },
-
-            makeRequire: function (relMap, options) {
-                options = options || {};
-
-                function localRequire(deps, callback, errback) {
-                    var id, map, requireMod;
-
-                    if (options.enableBuildCallback && callback && isFunction(callback)) {
-                        callback.__requireJsBuild = true;
-                    }
-
-                    if (typeof deps === 'string') {
-                        if (isFunction(callback)) {
-                            //Invalid call
-                            return onError(makeError('requireargs', 'Invalid require call'), errback);
-                        }
-
-                        //If require|exports|module are requested, get the
-                        //value for them from the special handlers. Caveat:
-                        //this only works while module is being defined.
-                        if (relMap && hasProp(handlers, deps)) {
-                            return handlers[deps](registry[relMap.id]);
-                        }
-
-                        //Synchronous access to one module. If require.get is
-                        //available (as in the Node adapter), prefer that.
-                        if (req.get) {
-                            return req.get(context, deps, relMap, localRequire);
-                        }
-
-                        //Normalize module name, if it contains . or ..
-                        map = makeModuleMap(deps, relMap, false, true);
-                        id = map.id;
-
-                        if (!hasProp(defined, id)) {
-                            return onError(makeError('notloaded', 'Module name "' +
-                                        id +
-                                        '" has not been loaded yet for context: ' +
-                                        contextName +
-                                        (relMap ? '' : '. Use require([])')));
-                        }
-                        return defined[id];
-                    }
-
-                    //Grab defines waiting in the global queue.
-                    intakeDefines();
-
-                    //Mark all the dependencies as needing to be loaded.
-                    context.nextTick(function () {
-                        //Some defines could have been added since the
-                        //require call, collect them.
-                        intakeDefines();
-
-                        requireMod = getModule(makeModuleMap(null, relMap));
-
-                        //Store if map config should be applied to this require
-                        //call for dependencies.
-                        requireMod.skipMap = options.skipMap;
-
-                        requireMod.init(deps, callback, errback, {
-                            enabled: true
-                        });
-
-                        checkLoaded();
-                    });
-
-                    return localRequire;
-                }
-
-                mixin(localRequire, {
-                    isBrowser: isBrowser,
-
-                    /**
-                     * Converts a module name + .extension into an URL path.
-                     * *Requires* the use of a module name. It does not support using
-                     * plain URLs like nameToUrl.
-                     */
-                    toUrl: function (moduleNamePlusExt) {
-                        var ext,
-                            index = moduleNamePlusExt.lastIndexOf('.'),
-                            segment = moduleNamePlusExt.split('/')[0],
-                            isRelative = segment === '.' || segment === '..';
-
-                        //Have a file extension alias, and it is not the
-                        //dots from a relative path.
-                        if (index !== -1 && (!isRelative || index > 1)) {
-                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
-                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
-                        }
-
-                        return context.nameToUrl(normalize(moduleNamePlusExt,
-                                                relMap && relMap.id, true), ext,  true);
-                    },
-
-                    defined: function (id) {
-                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
-                    },
-
-                    specified: function (id) {
-                        id = makeModuleMap(id, relMap, false, true).id;
-                        return hasProp(defined, id) || hasProp(registry, id);
-                    }
-                });
-
-                //Only allow undef on top level require calls
-                if (!relMap) {
-                    localRequire.undef = function (id) {
-                        //Bind any waiting define() calls to this context,
-                        //fix for #408
-                        takeGlobalQueue();
-
-                        var map = makeModuleMap(id, relMap, true),
-                            mod = getOwn(registry, id);
-
-                        removeScript(id);
-
-                        delete defined[id];
-                        delete urlFetched[map.url];
-                        delete undefEvents[id];
-
-                        if (mod) {
-                            //Hold on to listeners in case the
-                            //module will be attempted to be reloaded
-                            //using a different config.
-                            if (mod.events.defined) {
-                                undefEvents[id] = mod.events;
-                            }
-
-                            cleanRegistry(id);
-                        }
-                    };
-                }
-
-                return localRequire;
-            },
-
-            /**
-             * Called to enable a module if it is still in the registry
-             * awaiting enablement. A second arg, parent, the parent module,
-             * is passed in for context, when this method is overriden by
-             * the optimizer. Not shown here to keep code compact.
-             */
-            enable: function (depMap) {
-                var mod = getOwn(registry, depMap.id);
-                if (mod) {
-                    getModule(depMap).enable();
-                }
-            },
-
-            /**
-             * Internal method used by environment adapters to complete a load event.
-             * A load event could be a script load or just a load pass from a synchronous
-             * load call.
-             * @param {String} moduleName the name of the module to potentially complete.
-             */
-            completeLoad: function (moduleName) {
-                var found, args, mod,
-                    shim = getOwn(config.shim, moduleName) || {},
-                    shExports = shim.exports;
-
-                takeGlobalQueue();
-
-                while (defQueue.length) {
-                    args = defQueue.shift();
-                    if (args[0] === null) {
-                        args[0] = moduleName;
-                        //If already found an anonymous module and bound it
-                        //to this name, then this is some other anon module
-                        //waiting for its completeLoad to fire.
-                        if (found) {
-                            break;
-                        }
-                        found = true;
-                    } else if (args[0] === moduleName) {
-                        //Found matching define call for this script!
-                        found = true;
-                    }
-
-                    callGetModule(args);
-                }
-
-                //Do this after the cycle of callGetModule in case the result
-                //of those calls/init calls changes the registry.
-                mod = getOwn(registry, moduleName);
-
-                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
-                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
-                        if (hasPathFallback(moduleName)) {
-                            return;
-                        } else {
-                            return onError(makeError('nodefine',
-                                             'No define call for ' + moduleName,
-                                             null,
-                                             [moduleName]));
-                        }
-                    } else {
-                        //A script that does not call define(), so just simulate
-                        //the call for it.
-                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
-                    }
-                }
-
-                checkLoaded();
-            },
-
-            /**
-             * Converts a module name to a file path. Supports cases where
-             * moduleName may actually be just an URL.
-             * Note that it **does not** call normalize on the moduleName,
-             * it is assumed to have already been normalized. This is an
-             * internal API, not a public one. Use toUrl for the public API.
-             */
-            nameToUrl: function (moduleName, ext, skipExt) {
-                var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
-                    parentPath;
-
-                //If a colon is in the URL, it indicates a protocol is used and it is just
-                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
-                //or ends with .js, then assume the user meant to use an url and not a module id.
-                //The slash is important for protocol-less URLs as well as full paths.
-                if (req.jsExtRegExp.test(moduleName)) {
-                    //Just a plain path, not module name lookup, so just return it.
-                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
-                    //an extension, this method probably needs to be reworked.
-                    url = moduleName + (ext || '');
-                } else {
-                    //A module that needs to be converted to a path.
-                    paths = config.paths;
-                    pkgs = config.pkgs;
-
-                    syms = moduleName.split('/');
-                    //For each module name segment, see if there is a path
-                    //registered for it. Start with most specific name
-                    //and work up from it.
-                    for (i = syms.length; i > 0; i -= 1) {
-                        parentModule = syms.slice(0, i).join('/');
-                        pkg = getOwn(pkgs, parentModule);
-                        parentPath = getOwn(paths, parentModule);
-                        if (parentPath) {
-                            //If an array, it means there are a few choices,
-                            //Choose the one that is desired
-                            if (isArray(parentPath)) {
-                                parentPath = parentPath[0];
-                            }
-                            syms.splice(0, i, parentPath);
-                            break;
-                        } else if (pkg) {
-                            //If module name is just the package name, then looking
-                            //for the main module.
-                            if (moduleName === pkg.name) {
-                                pkgPath = pkg.location + '/' + pkg.main;
-                            } else {
-                                pkgPath = pkg.location;
-                            }
-                            syms.splice(0, i, pkgPath);
-                            break;
-                        }
-                    }
-
-                    //Join the path parts together, then figure out if baseUrl is needed.
-                    url = syms.join('/');
-                    url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
-                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
-                }
-
-                return config.urlArgs ? url +
-                                        ((url.indexOf('?') === -1 ? '?' : '&') +
-                                         config.urlArgs) : url;
-            },
-
-            //Delegates to req.load. Broken out as a separate function to
-            //allow overriding in the optimizer.
-            load: function (id, url) {
-                req.load(context, id, url);
-            },
-
-            /**
-             * Executes a module callback function. Broken out as a separate function
-             * solely to allow the build system to sequence the files in the built
-             * layer in the right sequence.
-             *
-             * @private
-             */
-            execCb: function (name, callback, args, exports) {
-                return callback.apply(exports, args);
-            },
-
-            /**
-             * callback for script loads, used to check status of loading.
-             *
-             * @param {Event} evt the event from the browser for the script
-             * that was loaded.
-             */
-            onScriptLoad: function (evt) {
-                //Using currentTarget instead of target for Firefox 2.0's sake. Not
-                //all old browsers will be supported, but this one was easy enough
-                //to support and still makes sense.
-                if (evt.type === 'load' ||
-                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
-                    //Reset interactive script so a script node is not held onto for
-                    //to long.
-                    interactiveScript = null;
-
-                    //Pull out the name of the module and the context.
-                    var data = getScriptData(evt);
-                    context.completeLoad(data.id);
-                }
-            },
-
-            /**
-             * Callback for script errors.
-             */
-            onScriptError: function (evt) {
-                var data = getScriptData(evt);
-                if (!hasPathFallback(data.id)) {
-                    return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
-                }
-            }
-        };
-
-        context.require = context.makeRequire();
-        return context;
-    }
-
-    /**
-     * Main entry point.
-     *
-     * If the only argument to require is a string, then the module that
-     * is represented by that string is fetched for the appropriate context.
-     *
-     * If the first argument is an array, then it will be treated as an array
-     * of dependency string names to fetch. An optional function callback can
-     * be specified to execute when all of those dependencies are available.
-     *
-     * Make a local req variable to help Caja compliance (it assumes things
-     * on a require that are not standardized), and to give a short
-     * name for minification/local scope use.
-     */
-    req = requirejs = function (deps, callback, errback, optional) {
-
-        //Find the right context, use default
-        var context, config,
-            contextName = defContextName;
-
-        // Determine if have config object in the call.
-        if (!isArray(deps) && typeof deps !== 'string') {
-            // deps is a config object
-            config = deps;
-            if (isArray(callback)) {
-                // Adjust args if there are dependencies
-                deps = callback;
-                callback = errback;
-                errback = optional;
-            } else {
-                deps = [];
-            }
-        }
-
-        if (config && config.context) {
-            contextName = config.context;
-        }
-
-        context = getOwn(contexts, contextName);
-        if (!context) {
-            context = contexts[contextName] = req.s.newContext(contextName);
-        }
-
-        if (config) {
-            context.configure(config);
-        }
-
-        return context.require(deps, callback, errback);
-    };
-
-    /**
-     * Support require.config() to make it easier to cooperate with other
-     * AMD loaders on globally agreed names.
-     */
-    req.config = function (config) {
-        return req(config);
-    };
-
-    /**
-     * Execute something after the current tick
-     * of the event loop. Override for other envs
-     * that have a better solution than setTimeout.
-     * @param  {Function} fn function to execute later.
-     */
-    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
-        setTimeout(fn, 4);
-    } : function (fn) { fn(); };
-
-    /**
-     * Export require as a global, but only if it does not already exist.
-     */
-    if (!require) {
-        require = req;
-    }
-
-    req.version = version;
-
-    //Used to filter out dependencies that are already paths.
-    req.jsExtRegExp = /^\/|:|\?|\.js$/;
-    req.isBrowser = isBrowser;
-    s = req.s = {
-        contexts: contexts,
-        newContext: newContext
-    };
-
-    //Create default context.
-    req({});
-
-    //Exports some context-sensitive methods on global require.
-    each([
-        'toUrl',
-        'undef',
-        'defined',
-        'specified'
-    ], function (prop) {
-        //Reference from contexts instead of early binding to default context,
-        //so that during builds, the latest instance of the default context
-        //with its config gets used.
-        req[prop] = function () {
-            var ctx = contexts[defContextName];
-            return ctx.require[prop].apply(ctx, arguments);
-        };
-    });
-
-    if (isBrowser) {
-        head = s.head = document.getElementsByTagName('head')[0];
-        //If BASE tag is in play, using appendChild is a problem for IE6.
-        //When that browser dies, this can be removed. Details in this jQuery bug:
-        //http://dev.jquery.com/ticket/2709
-        baseElement = document.getElementsByTagName('base')[0];
-        if (baseElement) {
-            head = s.head = baseElement.parentNode;
-        }
-    }
-
-    /**
-     * Any errors that require explicitly generates will be passed to this
-     * function. Intercept/override it if you want custom error handling.
-     * @param {Error} err the error object.
-     */
-    req.onError = defaultOnError;
-
-    /**
-     * Creates the node for the load command. Only used in browser envs.
-     */
-    req.createNode = function (config, moduleName, url) {
-        var node = config.xhtml ?
-                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
-                document.createElement('script');
-        node.type = config.scriptType || 'text/javascript';
-        node.charset = 'utf-8';
-        node.async = true;
-        return node;
-    };
-
-    /**
-     * Does the request to load a module for the browser case.
-     * Make this a separate function to allow other environments
-     * to override it.
-     *
-     * @param {Object} context the require context to find state.
-     * @param {String} moduleName the name of the module.
-     * @param {Object} url the URL to the module.
-     */
-    req.load = function (context, moduleName, url) {
-        var config = (context && context.config) || {},
-            node;
-        if (isBrowser) {
-            //In the browser so use a script tag
-            node = req.createNode(config, moduleName, url);
-
-            node.setAttribute('data-requirecontext', context.contextName);
-            node.setAttribute('data-requiremodule', moduleName);
-
-            //Set up load listener. Test attachEvent first because IE9 has
-            //a subtle issue in its addEventListener and script onload firings
-            //that do not match the behavior of all other browsers with
-            //addEventListener support, which fire the onload event for a
-            //script right after the script execution. See:
-            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
-            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
-            //script execution mode.
-            if (node.attachEvent &&
-                    //Check if node.attachEvent is artificially added by custom script or
-                    //natively supported by browser
-                    //read https://github.com/jrburke/requirejs/issues/187
-                    //if we can NOT find [native code] then it must NOT natively supported.
-                    //in IE8, node.attachEvent does not have toString()
-                    //Note the test for "[native code" with no closing brace, see:
-                    //https://github.com/jrburke/requirejs/issues/273
-                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
-                    !isOpera) {
-                //Probably IE. IE (at least 6-8) do not fire
-                //script onload right after executing the script, so
-                //we cannot tie the anonymous define call to a name.
-                //However, IE reports the script as being in 'interactive'
-                //readyState at the time of the define call.
-                useInteractive = true;
-
-                node.attachEvent('onreadystatechange', context.onScriptLoad);
-                //It would be great to add an error handler here to catch
-                //404s in IE9+. However, onreadystatechange will fire before
-                //the error handler, so that does not help. If addEventListener
-                //is used, then IE will fire error before load, but we cannot
-                //use that pathway given the connect.microsoft.com issue
-                //mentioned above about not doing the 'script execute,
-                //then fire the script load event listener before execute
-                //next script' that other browsers do.
-                //Best hope: IE10 fixes the issues,
-                //and then destroys all installs of IE 6-9.
-                //node.attachEvent('onerror', context.onScriptError);
-            } else {
-                node.addEventListener('load', context.onScriptLoad, false);
-                node.addEventListener('error', context.onScriptError, false);
-            }
-            node.src = url;
-
-            //For some cache cases in IE 6-8, the script executes before the end
-            //of the appendChild execution, so to tie an anonymous define
-            //call to the module name (which is stored on the node), hold on
-            //to a reference to this node, but clear after the DOM insertion.
-            currentlyAddingScript = node;
-            if (baseElement) {
-                head.insertBefore(node, baseElement);
-            } else {
-                head.appendChild(node);
-            }
-            currentlyAddingScript = null;
-
-            return node;
-        } else if (isWebWorker) {
-            try {
-                //In a web worker, use importScripts. This is not a very
-                //efficient use of importScripts, importScripts will block until
-                //its script is downloaded and evaluated. However, if web workers
-                //are in play, the expectation that a build has been done so that
-                //only one script needs to be loaded anyway. This may need to be
-                //reevaluated if other use cases become common.
-                importScripts(url);
-
-                //Account for anonymous modules
-                context.completeLoad(moduleName);
-            } catch (e) {
-                context.onError(makeError('importscripts',
-                                'importScripts failed for ' +
-                                    moduleName + ' at ' + url,
-                                e,
-                                [moduleName]));
-            }
-        }
-    };
-
-    function getInteractiveScript() {
-        if (interactiveScript && interactiveScript.readyState === 'interactive') {
-            return interactiveScript;
-        }
-
-        eachReverse(scripts(), function (script) {
-            if (script.readyState === 'interactive') {
-                return (interactiveScript = script);
-            }
-        });
-        return interactiveScript;
-    }
-
-    //Look for a data-main script attribute, which could also adjust the baseUrl.
-    if (isBrowser && !cfg.skipDataMain) {
-        //Figure out baseUrl. Get it from the script tag with require.js in it.
-        eachReverse(scripts(), function (script) {
-            //Set the 'head' where we can append children by
-            //using the script's parent.
-            if (!head) {
-                head = script.parentNode;
-            }
-
-            //Look for a data-main attribute to set main script for the page
-            //to load. If it is there, the path to data main becomes the
-            //baseUrl, if it is not already set.
-            dataMain = script.getAttribute('data-main');
-            if (dataMain) {
-                //Preserve dataMain in case it is a path (i.e. contains '?')
-                mainScript = dataMain;
-
-                //Set final baseUrl if there is not already an explicit one.
-                if (!cfg.baseUrl) {
-                    //Pull off the directory of data-main for use as the
-                    //baseUrl.
-                    src = mainScript.split('/');
-                    mainScript = src.pop();
-                    subPath = src.length ? src.join('/')  + '/' : './';
-
-                    cfg.baseUrl = subPath;
-                }
-
-                //Strip off any trailing .js since mainScript is now
-                //like a module name.
-                mainScript = mainScript.replace(jsSuffixRegExp, '');
-
-                 //If mainScript is still a path, fall back to dataMain
-                if (req.jsExtRegExp.test(mainScript)) {
-                    mainScript = dataMain;
-                }
-
-                //Put the data-main script in the files to load.
-                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
-
-                return true;
-            }
-        });
-    }
-
-    /**
-     * The function that handles definitions of modules. Differs from
-     * require() in that a string for the module should be the first argument,
-     * and the function to execute after dependencies are loaded should
-     * return a value to define the module corresponding to the first argument's
-     * name.
-     */
-    define = function (name, deps, callback) {
-        var node, context;
-
-        //Allow for anonymous modules
-        if (typeof name !== 'string') {
-            //Adjust args appropriately
-            callback = deps;
-            deps = name;
-            name = null;
-        }
-
-        //This module may not have dependencies
-        if (!isArray(deps)) {
-            callback = deps;
-            deps = null;
-        }
-
-        //If no name, and callback is a function, then figure out if it a
-        //CommonJS thing with dependencies.
-        if (!deps && isFunction(callback)) {
-            deps = [];
-            //Remove comments from the callback string,
-            //look for require calls, and pull them into the dependencies,
-            //but only if there are function args.
-            if (callback.length) {
-                callback
-                    .toString()
-                    .replace(commentRegExp, '')
-                    .replace(cjsRequireRegExp, function (match, dep) {
-                        deps.push(dep);
-                    });
-
-                //May be a CommonJS thing even without require calls, but still
-                //could use exports, and module. Avoid doing exports and module
-                //work though if it just needs require.
-                //REQUIRES the function to expect the CommonJS variables in the
-                //order listed below.
-                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
-            }
-        }
-
-        //If in IE 6-8 and hit an anonymous define() call, do the interactive
-        //work.
-        if (useInteractive) {
-            node = currentlyAddingScript || getInteractiveScript();
-            if (node) {
-                if (!name) {
-                    name = node.getAttribute('data-requiremodule');
-                }
-                context = contexts[node.getAttribute('data-requirecontext')];
-            }
-        }
-
-        //Always save off evaluating the def call until the script onload handler.
-        //This allows multiple modules to be in a file without prematurely
-        //tracing dependencies, and allows for anonymous module support,
-        //where the module name is not known until the script onload event
-        //occurs. If no context, use the global queue, and get it processed
-        //in the onscript load callback.
-        (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
-    };
-
-    define.amd = {
-        jQuery: true
-    };
-
-
-    /**
-     * Executes the text. Normally just uses eval, but can be modified
-     * to use a better, environment-specific call. Only used for transpiling
-     * loader plugins, not for plain JS modules.
-     * @param {String} text the text to execute/evaluate.
-     */
-    req.exec = function (text) {
-        /*jslint evil: true */
-        return eval(text);
-    };
-
-    //Set up with config info.
-    req(cfg);
-}(this));
diff --git a/lib/handlebars/spec/env/runner.js b/lib/handlebars/spec/env/runner.js
deleted file mode 100644
index 56fc8d443..000000000
--- a/lib/handlebars/spec/env/runner.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*eslint-disable no-console */
-var fs = require('fs'),
-    Mocha = require('mocha'),
-    path = require('path');
-
-var errors = 0,
-    testDir = path.dirname(__dirname),
-    grep = process.argv[2];
-
-var files = [ testDir + '/basic.js' ];
-
-var files = fs.readdirSync(testDir)
-      .filter(function(name) { return (/.*\.js$/).test(name); })
-      .map(function(name) { return testDir + '/' + name; });
-
-run('./node', function() {
-  run('./browser', function() {
-    run('./runtime', function() {
-      /*eslint-disable no-process-exit */
-      process.exit(errors);
-      /*eslint-enable no-process-exit */
-    });
-  });
-});
-
-
-function run(env, callback) {
-  var mocha = new Mocha();
-  mocha.ui('bdd');
-  mocha.files = files.slice();
-  if (grep) {
-    mocha.grep(grep);
-  }
-
-  files.forEach(function(name) {
-    delete require.cache[name];
-  });
-
-  console.log('Running env: ' + env);
-  require(env);
-  mocha.run(function(errorCount) {
-    errors += errorCount;
-    callback();
-  });
-}
diff --git a/lib/handlebars/spec/env/runtime.js b/lib/handlebars/spec/env/runtime.js
deleted file mode 100644
index a7b42f51e..000000000
--- a/lib/handlebars/spec/env/runtime.js
+++ /dev/null
@@ -1,50 +0,0 @@
-require('./common');
-
-var fs = require('fs'),
-    vm = require('vm');
-
-global.Handlebars = 'no-conflict';
-vm.runInThisContext(fs.readFileSync(__dirname + '/../../dist/handlebars.runtime.js'), 'dist/handlebars.runtime.js');
-
-var parse = require('../../dist/cjs/handlebars/compiler/base').parse;
-var compiler = require('../../dist/cjs/handlebars/compiler/compiler');
-var JavaScriptCompiler = require('../../dist/cjs/handlebars/compiler/javascript-compiler');
-
-global.CompilerContext = {
-  browser: true,
-
-  compile: function(template, options) {
-    // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.precompile = function(precompileTemplate, precompileOptions) {
-      return compiler.precompile(precompileTemplate, precompileOptions, handlebarsEnv);
-    };
-    handlebarsEnv.parse = parse;
-    handlebarsEnv.Compiler = compiler.Compiler;
-    handlebarsEnv.JavaScriptCompiler = JavaScriptCompiler;
-
-    var templateSpec = handlebarsEnv.precompile(template, options);
-    return handlebarsEnv.template(safeEval(templateSpec));
-  },
-  compileWithPartial: function(template, options) {
-    // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.compile = function(compileTemplate, compileOptions) {
-      return compiler.compile(compileTemplate, compileOptions, handlebarsEnv);
-    };
-    handlebarsEnv.parse = parse;
-    handlebarsEnv.Compiler = compiler.Compiler;
-    handlebarsEnv.JavaScriptCompiler = JavaScriptCompiler;
-
-    return handlebarsEnv.compile(template, options);
-  }
-};
-
-function safeEval(templateSpec) {
-  /*eslint-disable no-eval, no-console */
-  try {
-    return eval('(' + templateSpec + ')');
-  } catch (err) {
-    console.error(templateSpec);
-    throw err;
-  }
-  /*eslint-enable no-eval, no-console */
-}
diff --git a/lib/handlebars/spec/expected/empty.amd.js b/lib/handlebars/spec/expected/empty.amd.js
deleted file mode 100644
index 852733b2f..000000000
--- a/lib/handlebars/spec/expected/empty.amd.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(['handlebars.runtime'], function(Handlebars) {
-  Handlebars = Handlebars["default"];  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-return templates['empty'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-    return "";
-},"useData":true});
-});
diff --git a/lib/handlebars/spec/helpers.js b/lib/handlebars/spec/helpers.js
deleted file mode 100644
index 54ef0f288..000000000
--- a/lib/handlebars/spec/helpers.js
+++ /dev/null
@@ -1,717 +0,0 @@
-describe('helpers', function() {
-  it('helper with complex lookup$', function() {
-    var string = '{{#goodbyes}}{{{link ../prefix}}}{{/goodbyes}}';
-    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
-    var helpers = {link: function(prefix) {
-      return '<a href="' + prefix + '/' + this.url + '">' + this.text + '</a>';
-    }};
-    shouldCompileTo(string, [hash, helpers], '<a href="/root/goodbye">Goodbye</a>');
-  });
-
-  it('helper for raw block gets raw content', function() {
-    var string = '{{{{raw}}}} {{test}} {{{{/raw}}}}';
-    var hash = { test: 'hello' };
-    var helpers = { raw: function(options) {
-        return options.fn();
-    } };
-    shouldCompileTo(string, [hash, helpers], ' {{test}} ',
-                    'raw block helper gets raw content');
-  });
-
-  it('helper for raw block gets parameters', function() {
-    var string = '{{{{raw 1 2 3}}}} {{test}} {{{{/raw}}}}';
-    var hash = { test: 'hello' };
-    var helpers = { raw: function(a, b, c, options) {
-        return options.fn() + a + b + c;
-    } };
-    shouldCompileTo(string, [hash, helpers], ' {{test}} 123',
-                    'raw block helper gets raw content');
-  });
-
-  it('helper block with complex lookup expression', function() {
-    var string = '{{#goodbyes}}{{../name}}{{/goodbyes}}';
-    var hash = {name: 'Alan'};
-    var helpers = {goodbyes: function(options) {
-      var out = '';
-      var byes = ['Goodbye', 'goodbye', 'GOODBYE'];
-      for (var i = 0, j = byes.length; i < j; i++) {
-        out += byes[i] + ' ' + options.fn(this) + '! ';
-      }
-      return out;
-    }};
-    shouldCompileTo(string, [hash, helpers], 'Goodbye Alan! goodbye Alan! GOODBYE Alan! ');
-  });
-
-  it('helper with complex lookup and nested template', function() {
-    var string = '{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}';
-    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
-    var helpers = {link: function(prefix, options) {
-        return '<a href="' + prefix + '/' + this.url + '">' + options.fn(this) + '</a>';
-    }};
-    shouldCompileToWithPartials(string, [hash, helpers], false, '<a href="/root/goodbye">Goodbye</a>');
-  });
-
-  it('helper with complex lookup and nested template in VM+Compiler', function() {
-    var string = '{{#goodbyes}}{{#link ../prefix}}{{text}}{{/link}}{{/goodbyes}}';
-    var hash = {prefix: '/root', goodbyes: [{text: 'Goodbye', url: 'goodbye'}]};
-    var helpers = {link: function(prefix, options) {
-        return '<a href="' + prefix + '/' + this.url + '">' + options.fn(this) + '</a>';
-    }};
-    shouldCompileToWithPartials(string, [hash, helpers], true, '<a href="/root/goodbye">Goodbye</a>');
-  });
-  it('helper returning undefined value', function() {
-    shouldCompileTo(' {{nothere}}', [{}, {nothere: function() {}}], ' ');
-    shouldCompileTo(' {{#nothere}}{{/nothere}}', [{}, {nothere: function() {}}], ' ');
-  });
-
-  it('block helper', function() {
-    var string = '{{#goodbyes}}{{text}}! {{/goodbyes}}cruel {{world}}!';
-    var template = CompilerContext.compile(string);
-
-    var result = template({world: 'world'}, { helpers: {goodbyes: function(options) { return options.fn({text: 'GOODBYE'}); }}});
-    equal(result, 'GOODBYE! cruel world!', 'Block helper executed');
-  });
-
-  it('block helper staying in the same context', function() {
-    var string = '{{#form}}<p>{{name}}</p>{{/form}}';
-    var template = CompilerContext.compile(string);
-
-    var result = template({name: 'Yehuda'}, {helpers: {form: function(options) { return '<form>' + options.fn(this) + '</form>'; } }});
-    equal(result, '<form><p>Yehuda</p></form>', 'Block helper executed with current context');
-  });
-
-  it('block helper should have context in this', function() {
-    var source = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
-    function link(options) {
-      return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
-    }
-    var data = { 'people': [
-      { 'name': 'Alan', 'id': 1 },
-      { 'name': 'Yehuda', 'id': 2 }
-    ]};
-
-    shouldCompileTo(source, [data, {link: link}], '<ul><li><a href=\"/people/1\">Alan</a></li><li><a href=\"/people/2\">Yehuda</a></li></ul>');
-  });
-
-  it('block helper for undefined value', function() {
-    shouldCompileTo("{{#empty}}shouldn't render{{/empty}}", {}, '');
-  });
-
-  it('block helper passing a new context', function() {
-    var string = '{{#form yehuda}}<p>{{name}}</p>{{/form}}';
-    var template = CompilerContext.compile(string);
-
-    var result = template({yehuda: {name: 'Yehuda'}}, { helpers: {form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }}});
-    equal(result, '<form><p>Yehuda</p></form>', 'Context variable resolved');
-  });
-
-  it('block helper passing a complex path context', function() {
-    var string = '{{#form yehuda/cat}}<p>{{name}}</p>{{/form}}';
-    var template = CompilerContext.compile(string);
-
-    var result = template({yehuda: {name: 'Yehuda', cat: {name: 'Harold'}}}, { helpers: {form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }}});
-    equal(result, '<form><p>Harold</p></form>', 'Complex path variable resolved');
-  });
-
-  it('nested block helpers', function() {
-    var string = '{{#form yehuda}}<p>{{name}}</p>{{#link}}Hello{{/link}}{{/form}}';
-    var template = CompilerContext.compile(string);
-
-    var result = template({
-      yehuda: {name: 'Yehuda' }
-    }, {
-      helpers: {
-        link: function(options) { return '<a href="' + this.name + '">' + options.fn(this) + '</a>'; },
-        form: function(context, options) { return '<form>' + options.fn(context) + '</form>'; }
-      }
-    });
-    equal(result, '<form><p>Yehuda</p><a href="Yehuda">Hello</a></form>', 'Both blocks executed');
-  });
-
-  it('block helper inverted sections', function() {
-    var string = '{{#list people}}{{name}}{{^}}<em>Nobody\'s here</em>{{/list}}';
-    function list(context, options) {
-      if (context.length > 0) {
-        var out = '<ul>';
-        for (var i = 0, j = context.length; i < j; i++) {
-          out += '<li>';
-          out += options.fn(context[i]);
-          out += '</li>';
-        }
-        out += '</ul>';
-        return out;
-      } else {
-        return '<p>' + options.inverse(this) + '</p>';
-      }
-    }
-
-    var hash = {people: [{name: 'Alan'}, {name: 'Yehuda'}]};
-    var empty = {people: []};
-    var rootMessage = {
-      people: [],
-      message: 'Nobody\'s here'
-    };
-
-    var messageString = '{{#list people}}Hello{{^}}{{message}}{{/list}}';
-
-    // the meaning here may be kind of hard to catch, but list.not is always called,
-    // so we should see the output of both
-    shouldCompileTo(string, [hash, { list: list }], '<ul><li>Alan</li><li>Yehuda</li></ul>', 'an inverse wrapper is passed in as a new context');
-    shouldCompileTo(string, [empty, { list: list }], '<p><em>Nobody\'s here</em></p>', 'an inverse wrapper can be optionally called');
-    shouldCompileTo(messageString, [rootMessage, { list: list }], '<p>Nobody&#x27;s here</p>', 'the context of an inverse is the parent of the block');
-  });
-
-  it('pathed lambas with parameters', function() {
-    var hash = {
-      helper: function() {
-        return 'winning';
-      }
-    };
-    hash.hash = hash;
-    var helpers = {
-      './helper': function() {
-        return 'fail';
-      }
-    };
-    shouldCompileTo('{{./helper 1}}', [hash, helpers], 'winning');
-    shouldCompileTo('{{hash/helper 1}}', [hash, helpers], 'winning');
-  });
-
-  describe('helpers hash', function() {
-    it('providing a helpers hash', function() {
-      shouldCompileTo('Goodbye {{cruel}} {{world}}!', [{cruel: 'cruel'}, {world: function() { return 'world'; }}], 'Goodbye cruel world!',
-                      'helpers hash is available');
-
-      shouldCompileTo('Goodbye {{#iter}}{{cruel}} {{world}}{{/iter}}!', [{iter: [{cruel: 'cruel'}]}, {world: function() { return 'world'; }}],
-                      'Goodbye cruel world!', 'helpers hash is available inside other blocks');
-    });
-
-    it('in cases of conflict, helpers win', function() {
-      shouldCompileTo('{{{lookup}}}', [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], 'helpers',
-                      'helpers hash has precedence escaped expansion');
-      shouldCompileTo('{{lookup}}', [{lookup: 'Explicit'}, {lookup: function() { return 'helpers'; }}], 'helpers',
-                      'helpers hash has precedence simple expansion');
-    });
-
-    it('the helpers hash is available is nested contexts', function() {
-      shouldCompileTo(
-        '{{#outer}}{{#inner}}{{helper}}{{/inner}}{{/outer}}',
-        [
-          {'outer': {'inner': {'unused': []}}},
-          {'helper': function() { return 'helper'; }}
-        ],
-        'helper',
-        'helpers hash is available in nested contexts.');
-    });
-
-    it('the helper hash should augment the global hash', function() {
-      handlebarsEnv.registerHelper('test_helper', function() { return 'found it!'; });
-
-      shouldCompileTo(
-        '{{test_helper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}', [
-          {cruel: 'cruel'},
-          {world: function() { return 'world!'; }}
-        ],
-        'found it! Goodbye cruel world!!');
-    });
-  });
-
-  describe('registration', function() {
-    it('unregisters', function() {
-      handlebarsEnv.helpers = {};
-
-      handlebarsEnv.registerHelper('foo', function() {
-        return 'fail';
-      });
-      handlebarsEnv.unregisterHelper('foo');
-      equals(handlebarsEnv.helpers.foo, undefined);
-    });
-
-    it('allows multiple globals', function() {
-      var helpers = handlebarsEnv.helpers;
-      handlebarsEnv.helpers = {};
-
-      handlebarsEnv.registerHelper({
-        'if': helpers['if'],
-        world: function() { return 'world!'; },
-        testHelper: function() { return 'found it!'; }
-      });
-
-      shouldCompileTo(
-        '{{testHelper}} {{#if cruel}}Goodbye {{cruel}} {{world}}!{{/if}}',
-        [{cruel: 'cruel'}],
-        'found it! Goodbye cruel world!!');
-    });
-    it('fails with multiple and args', function() {
-      shouldThrow(function() {
-        handlebarsEnv.registerHelper({
-          world: function() { return 'world!'; },
-          testHelper: function() { return 'found it!'; }
-        }, {});
-      }, Error, 'Arg not supported with multiple helpers');
-    });
-  });
-
-  it('decimal number literals work', function() {
-    var string = 'Message: {{hello -1.2 1.2}}';
-    var helpers = {hello: function(times, times2) {
-      if (typeof times !== 'number') { times = 'NaN'; }
-      if (typeof times2 !== 'number') { times2 = 'NaN'; }
-      return 'Hello ' + times + ' ' + times2 + ' times';
-    }};
-    shouldCompileTo(string, [{}, helpers], 'Message: Hello -1.2 1.2 times', 'template with a negative integer literal');
-  });
-
-  it('negative number literals work', function() {
-    var string = 'Message: {{hello -12}}';
-    var helpers = {hello: function(times) {
-      if (typeof times !== 'number') { times = 'NaN'; }
-      return 'Hello ' + times + ' times';
-    }};
-    shouldCompileTo(string, [{}, helpers], 'Message: Hello -12 times', 'template with a negative integer literal');
-  });
-
-  describe('String literal parameters', function() {
-    it('simple literals work', function() {
-      var string = 'Message: {{hello "world" 12 true false}}';
-      var helpers = {hello: function(param, times, bool1, bool2) {
-        if (typeof times !== 'number') { times = 'NaN'; }
-        if (typeof bool1 !== 'boolean') { bool1 = 'NaB'; }
-        if (typeof bool2 !== 'boolean') { bool2 = 'NaB'; }
-        return 'Hello ' + param + ' ' + times + ' times: ' + bool1 + ' ' + bool2;
-      }};
-      shouldCompileTo(string, [{}, helpers], 'Message: Hello world 12 times: true false', 'template with a simple String literal');
-    });
-
-    it('using a quote in the middle of a parameter raises an error', function() {
-      var string = 'Message: {{hello wo"rld"}}';
-      shouldThrow(function() {
-        CompilerContext.compile(string);
-      }, Error);
-    });
-
-    it('escaping a String is possible', function() {
-      var string = 'Message: {{{hello "\\"world\\""}}}';
-      var helpers = {hello: function(param) { return 'Hello ' + param; }};
-      shouldCompileTo(string, [{}, helpers], 'Message: Hello "world"', 'template with an escaped String literal');
-    });
-
-    it("it works with ' marks", function() {
-      var string = 'Message: {{{hello "Alan\'s world"}}}';
-      var helpers = {hello: function(param) { return 'Hello ' + param; }};
-      shouldCompileTo(string, [{}, helpers], "Message: Hello Alan's world", "template with a ' mark");
-    });
-  });
-
-  it('negative number literals work', function() {
-    var string = 'Message: {{hello -12}}';
-    var helpers = {hello: function(times) {
-      if (typeof times !== 'number') { times = 'NaN'; }
-      return 'Hello ' + times + ' times';
-    }};
-    shouldCompileTo(string, [{}, helpers], 'Message: Hello -12 times', 'template with a negative integer literal');
-  });
-
-  describe('multiple parameters', function() {
-    it('simple multi-params work', function() {
-      var string = 'Message: {{goodbye cruel world}}';
-      var hash = {cruel: 'cruel', world: 'world'};
-      var helpers = {goodbye: function(cruel, world) { return 'Goodbye ' + cruel + ' ' + world; }};
-      shouldCompileTo(string, [hash, helpers], 'Message: Goodbye cruel world', 'regular helpers with multiple params');
-    });
-
-    it('block multi-params work', function() {
-      var string = 'Message: {{#goodbye cruel world}}{{greeting}} {{adj}} {{noun}}{{/goodbye}}';
-      var hash = {cruel: 'cruel', world: 'world'};
-      var helpers = {goodbye: function(cruel, world, options) {
-        return options.fn({greeting: 'Goodbye', adj: cruel, noun: world});
-      }};
-      shouldCompileTo(string, [hash, helpers], 'Message: Goodbye cruel world', 'block helpers with multiple params');
-    });
-  });
-
-  describe('hash', function() {
-    it('helpers can take an optional hash', function() {
-      var template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" times=12}}');
-
-      var helpers = {
-        goodbye: function(options) {
-          return 'GOODBYE ' + options.hash.cruel + ' ' + options.hash.world + ' ' + options.hash.times + ' TIMES';
-        }
-      };
-
-      var context = {};
-
-      var result = template(context, {helpers: helpers});
-      equals(result, 'GOODBYE CRUEL WORLD 12 TIMES', 'Helper output hash');
-    });
-
-    it('helpers can take an optional hash with booleans', function() {
-      var helpers = {
-        goodbye: function(options) {
-          if (options.hash.print === true) {
-            return 'GOODBYE ' + options.hash.cruel + ' ' + options.hash.world;
-          } else if (options.hash.print === false) {
-            return 'NOT PRINTING';
-          } else {
-            return 'THIS SHOULD NOT HAPPEN';
-          }
-        }
-      };
-
-      var context = {};
-
-      var template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" print=true}}');
-      var result = template(context, {helpers: helpers});
-      equals(result, 'GOODBYE CRUEL WORLD', 'Helper output hash');
-
-      template = CompilerContext.compile('{{goodbye cruel="CRUEL" world="WORLD" print=false}}');
-      result = template(context, {helpers: helpers});
-      equals(result, 'NOT PRINTING', 'Boolean helper parameter honored');
-    });
-
-    it('block helpers can take an optional hash', function() {
-      var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" times=12}}world{{/goodbye}}');
-
-      var helpers = {
-        goodbye: function(options) {
-          return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this) + ' ' + options.hash.times + ' TIMES';
-        }
-      };
-
-      var result = template({}, {helpers: helpers});
-      equals(result, 'GOODBYE CRUEL world 12 TIMES', 'Hash parameters output');
-    });
-
-    it('block helpers can take an optional hash with single quoted stings', function() {
-      var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" times=12}}world{{/goodbye}}');
-
-      var helpers = {
-        goodbye: function(options) {
-          return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this) + ' ' + options.hash.times + ' TIMES';
-        }
-      };
-
-      var result = template({}, {helpers: helpers});
-      equals(result, 'GOODBYE CRUEL world 12 TIMES', 'Hash parameters output');
-    });
-
-    it('block helpers can take an optional hash with booleans', function() {
-      var helpers = {
-        goodbye: function(options) {
-          if (options.hash.print === true) {
-            return 'GOODBYE ' + options.hash.cruel + ' ' + options.fn(this);
-          } else if (options.hash.print === false) {
-            return 'NOT PRINTING';
-          } else {
-            return 'THIS SHOULD NOT HAPPEN';
-          }
-        }
-      };
-
-      var template = CompilerContext.compile('{{#goodbye cruel="CRUEL" print=true}}world{{/goodbye}}');
-      var result = template({}, {helpers: helpers});
-      equals(result, 'GOODBYE CRUEL world', 'Boolean hash parameter honored');
-
-      template = CompilerContext.compile('{{#goodbye cruel="CRUEL" print=false}}world{{/goodbye}}');
-      result = template({}, {helpers: helpers});
-      equals(result, 'NOT PRINTING', 'Boolean hash parameter honored');
-    });
-  });
-
-  describe('helperMissing', function() {
-    it('if a context is not found, helperMissing is used', function() {
-      shouldThrow(function() {
-          var template = CompilerContext.compile('{{hello}} {{link_to world}}');
-          template({});
-      }, undefined, /Missing helper: "link_to"/);
-    });
-
-    it('if a context is not found, custom helperMissing is used', function() {
-      var string = '{{hello}} {{link_to world}}';
-      var context = { hello: 'Hello', world: 'world' };
-
-      var helpers = {
-        helperMissing: function(mesg, options) {
-          if (options.name === 'link_to') {
-            return new Handlebars.SafeString('<a>' + mesg + '</a>');
-          }
-        }
-      };
-
-      shouldCompileTo(string, [context, helpers], 'Hello <a>world</a>');
-    });
-
-    it('if a value is not found, custom helperMissing is used', function() {
-      var string = '{{hello}} {{link_to}}';
-      var context = { hello: 'Hello', world: 'world' };
-
-      var helpers = {
-        helperMissing: function(options) {
-          if (options.name === 'link_to') {
-            return new Handlebars.SafeString('<a>winning</a>');
-          }
-        }
-      };
-
-      shouldCompileTo(string, [context, helpers], 'Hello <a>winning</a>');
-    });
-  });
-
-  describe('knownHelpers', function() {
-    it('Known helper should render helper', function() {
-      var template = CompilerContext.compile('{{hello}}', {knownHelpers: {hello: true}});
-
-      var result = template({}, {helpers: {hello: function() { return 'foo'; }}});
-      equal(result, 'foo', "'foo' should === '" + result);
-    });
-
-    it('Unknown helper in knownHelpers only mode should be passed as undefined', function() {
-      var template = CompilerContext.compile('{{typeof hello}}', {knownHelpers: {'typeof': true}, knownHelpersOnly: true});
-
-      var result = template({}, {helpers: {'typeof': function(arg) { return typeof arg; }, hello: function() { return 'foo'; }}});
-      equal(result, 'undefined', "'undefined' should === '" + result);
-    });
-    it('Builtin helpers available in knownHelpers only mode', function() {
-      var template = CompilerContext.compile('{{#unless foo}}bar{{/unless}}', {knownHelpersOnly: true});
-
-      var result = template({});
-      equal(result, 'bar', "'bar' should === '" + result);
-    });
-    it('Field lookup works in knownHelpers only mode', function() {
-      var template = CompilerContext.compile('{{foo}}', {knownHelpersOnly: true});
-
-      var result = template({foo: 'bar'});
-      equal(result, 'bar', "'bar' should === '" + result);
-    });
-    it('Conditional blocks work in knownHelpers only mode', function() {
-      var template = CompilerContext.compile('{{#foo}}bar{{/foo}}', {knownHelpersOnly: true});
-
-      var result = template({foo: 'baz'});
-      equal(result, 'bar', "'bar' should === '" + result);
-    });
-    it('Invert blocks work in knownHelpers only mode', function() {
-      var template = CompilerContext.compile('{{^foo}}bar{{/foo}}', {knownHelpersOnly: true});
-
-      var result = template({foo: false});
-      equal(result, 'bar', "'bar' should === '" + result);
-    });
-    it('Functions are bound to the context in knownHelpers only mode', function() {
-      var template = CompilerContext.compile('{{foo}}', {knownHelpersOnly: true});
-      var result = template({foo: function() { return this.bar; }, bar: 'bar'});
-      equal(result, 'bar', "'bar' should === '" + result);
-    });
-    it('Unknown helper call in knownHelpers only mode should throw', function() {
-      shouldThrow(function() {
-        CompilerContext.compile('{{typeof hello}}', {knownHelpersOnly: true});
-      }, Error);
-    });
-  });
-
-  describe('blockHelperMissing', function() {
-    it('lambdas are resolved by blockHelperMissing, not handlebars proper', function() {
-      var string = '{{#truthy}}yep{{/truthy}}';
-      var data = { truthy: function() { return true; } };
-      shouldCompileTo(string, data, 'yep');
-    });
-    it('lambdas resolved by blockHelperMissing are bound to the context', function() {
-      var string = '{{#truthy}}yep{{/truthy}}';
-      var boundData = { truthy: function() { return this.truthiness(); }, truthiness: function() { return false; } };
-      shouldCompileTo(string, boundData, '');
-    });
-  });
-
-  describe('name field', function() {
-    var context = {};
-    var helpers = {
-      blockHelperMissing: function() {
-        return 'missing: ' + arguments[arguments.length - 1].name;
-      },
-      helperMissing: function() {
-        return 'helper missing: ' + arguments[arguments.length - 1].name;
-      },
-      helper: function() {
-        return 'ran: ' + arguments[arguments.length - 1].name;
-      }
-    };
-
-    it('should include in ambiguous mustache calls', function() {
-      shouldCompileTo('{{helper}}', [context, helpers], 'ran: helper');
-    });
-    it('should include in helper mustache calls', function() {
-      shouldCompileTo('{{helper 1}}', [context, helpers], 'ran: helper');
-    });
-    it('should include in ambiguous block calls', function() {
-      shouldCompileTo('{{#helper}}{{/helper}}', [context, helpers], 'ran: helper');
-    });
-    it('should include in simple block calls', function() {
-      shouldCompileTo('{{#./helper}}{{/./helper}}', [context, helpers], 'missing: ./helper');
-    });
-    it('should include in helper block calls', function() {
-      shouldCompileTo('{{#helper 1}}{{/helper}}', [context, helpers], 'ran: helper');
-    });
-    it('should include in known helper calls', function() {
-      var template = CompilerContext.compile('{{helper}}', {knownHelpers: {'helper': true}, knownHelpersOnly: true});
-
-      equal(template({}, {helpers: helpers}), 'ran: helper');
-    });
-
-    it('should include full id', function() {
-      shouldCompileTo('{{#foo.helper}}{{/foo.helper}}', [{foo: {}}, helpers], 'missing: foo.helper');
-    });
-
-    it('should include full id if a hash is passed', function() {
-      shouldCompileTo('{{#foo.helper bar=baz}}{{/foo.helper}}', [{foo: {}}, helpers], 'helper missing: foo.helper');
-    });
-  });
-
-  describe('name conflicts', function() {
-    it('helpers take precedence over same-named context properties', function() {
-      var template = CompilerContext.compile('{{goodbye}} {{cruel world}}');
-
-      var helpers = {
-        goodbye: function() {
-          return this.goodbye.toUpperCase();
-        },
-
-        cruel: function(world) {
-          return 'cruel ' + world.toUpperCase();
-        }
-      };
-
-      var context = {
-        goodbye: 'goodbye',
-        world: 'world'
-      };
-
-      var result = template(context, {helpers: helpers});
-      equals(result, 'GOODBYE cruel WORLD', 'Helper executed');
-    });
-
-    it('helpers take precedence over same-named context properties$', function() {
-      var template = CompilerContext.compile('{{#goodbye}} {{cruel world}}{{/goodbye}}');
-
-      var helpers = {
-        goodbye: function(options) {
-          return this.goodbye.toUpperCase() + options.fn(this);
-        },
-
-        cruel: function(world) {
-          return 'cruel ' + world.toUpperCase();
-        }
-      };
-
-      var context = {
-        goodbye: 'goodbye',
-        world: 'world'
-      };
-
-      var result = template(context, {helpers: helpers});
-      equals(result, 'GOODBYE cruel WORLD', 'Helper executed');
-    });
-
-    it('Scoped names take precedence over helpers', function() {
-      var template = CompilerContext.compile('{{this.goodbye}} {{cruel world}} {{cruel this.goodbye}}');
-
-      var helpers = {
-        goodbye: function() {
-          return this.goodbye.toUpperCase();
-        },
-
-        cruel: function(world) {
-          return 'cruel ' + world.toUpperCase();
-        }
-      };
-
-      var context = {
-        goodbye: 'goodbye',
-        world: 'world'
-      };
-
-      var result = template(context, {helpers: helpers});
-      equals(result, 'goodbye cruel WORLD cruel GOODBYE', 'Helper not executed');
-    });
-
-    it('Scoped names take precedence over block helpers', function() {
-      var template = CompilerContext.compile('{{#goodbye}} {{cruel world}}{{/goodbye}} {{this.goodbye}}');
-
-      var helpers = {
-        goodbye: function(options) {
-          return this.goodbye.toUpperCase() + options.fn(this);
-        },
-
-        cruel: function(world) {
-          return 'cruel ' + world.toUpperCase();
-        }
-      };
-
-      var context = {
-        goodbye: 'goodbye',
-        world: 'world'
-      };
-
-      var result = template(context, {helpers: helpers});
-      equals(result, 'GOODBYE cruel WORLD goodbye', 'Helper executed');
-    });
-  });
-
-  describe('block params', function() {
-    it('should take presedence over context values', function() {
-      var hash = {value: 'foo'};
-      var helpers = {
-        goodbyes: function(options) {
-          equals(options.fn.blockParams, 1);
-          return options.fn({value: 'bar'}, {blockParams: [1, 2]});
-        }
-      };
-      shouldCompileTo('{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{value}}', [hash, helpers], '1foo');
-    });
-    it('should take presedence over helper values', function() {
-      var hash = {};
-      var helpers = {
-        value: function() {
-          return 'foo';
-        },
-        goodbyes: function(options) {
-          equals(options.fn.blockParams, 1);
-          return options.fn({}, {blockParams: [1, 2]});
-        }
-      };
-      shouldCompileTo('{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{value}}', [hash, helpers], '1foo');
-    });
-    it('should not take presedence over pathed values', function() {
-      var hash = {value: 'bar'};
-      var helpers = {
-        value: function() {
-          return 'foo';
-        },
-        goodbyes: function(options) {
-          equals(options.fn.blockParams, 1);
-          return options.fn(this, {blockParams: [1, 2]});
-        }
-      };
-      shouldCompileTo('{{#goodbyes as |value|}}{{./value}}{{/goodbyes}}{{value}}', [hash, helpers], 'barfoo');
-    });
-    it('should take presednece over parent block params', function() {
-      var hash = {value: 'foo'},
-          value = 1;
-      var helpers = {
-        goodbyes: function(options) {
-          return options.fn({value: 'bar'}, {blockParams: options.fn.blockParams === 1 ? [value++, value++] : undefined});
-        }
-      };
-      shouldCompileTo('{{#goodbyes as |value|}}{{#goodbyes}}{{value}}{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{/goodbyes}}{{/goodbyes}}{{value}}', [hash, helpers], '13foo');
-    });
-
-    it('should allow block params on chained helpers', function() {
-      var hash = {value: 'foo'};
-      var helpers = {
-        goodbyes: function(options) {
-          equals(options.fn.blockParams, 1);
-          return options.fn({value: 'bar'}, {blockParams: [1, 2]});
-        }
-      };
-      shouldCompileTo('{{#if bar}}{{else goodbyes as |value|}}{{value}}{{/if}}{{value}}', [hash, helpers], '1foo');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/index.html b/lib/handlebars/spec/index.html
deleted file mode 100644
index 348ae89d6..000000000
--- a/lib/handlebars/spec/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html>
-  <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      mocha.setup('bdd');
-    </script>
-    <script src="/dist/handlebars.js"></script>
-
-    <script src="/spec/env/json2.js"></script>
-    <script src="/spec/env/common.js"></script>
-    <script>
-      var CompilerContext = {
-        compile: function(template, options) {
-          var templateSpec = handlebarsEnv.precompile(template, options);
-          return handlebarsEnv.template(safeEval(templateSpec));
-        },
-        compileWithPartial: function(template, options) {
-          return handlebarsEnv.compile(template, options);
-        }
-      };
-
-      function safeEval(templateSpec) {
-        try {
-          var ret;
-          eval('ret = ' + templateSpec);
-          return ret;
-        } catch (err) {
-          console.error(templateSpec);
-          throw err;
-        }
-      }
-    </script>
-    <script src="/tmp/tests.js"></script>
-    <script>
-      onload = function(){
-        mocha.globals(['mochaResults'])
-        // The test harness leaks under FF. We should have decent global leak coverage from other tests
-        if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-          mocha.checkLeaks();
-        }
-        var runner = mocha.run();
-
-        //Reporting for saucelabs
-        var failedTests = [];
-        runner.on('end', function(){
-          window.mochaResults = runner.stats;
-          window.mochaResults.reports = failedTests;
-        });
-
-        runner.on('fail', logFailure);
-
-        function logFailure(test, err){
-
-          var flattenTitles = function(test){
-            var titles = [];
-            while (test.parent.title){
-              titles.push(test.parent.title);
-              test = test.parent;
-            }
-            return titles.reverse();
-          };
-
-          failedTests.push({
-            name: test.title,
-            result: false,
-            message: err.message,
-            stack: err.stack,
-            titles: flattenTitles(test)
-          });
-        };
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-  </body>
-</html>
diff --git a/lib/handlebars/spec/javascript-compiler.js b/lib/handlebars/spec/javascript-compiler.js
deleted file mode 100644
index 28e698824..000000000
--- a/lib/handlebars/spec/javascript-compiler.js
+++ /dev/null
@@ -1,78 +0,0 @@
-describe('javascript-compiler api', function() {
-  if (!Handlebars.JavaScriptCompiler) {
-    return;
-  }
-
-  describe('#nameLookup', function() {
-    var $superName;
-    beforeEach(function() {
-      $superName = handlebarsEnv.JavaScriptCompiler.prototype.nameLookup;
-    });
-    afterEach(function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.nameLookup = $superName;
-    });
-
-    it('should allow override', function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.nameLookup = function(parent, name) {
-        return parent + '.bar_' + name;
-      };
-      /*eslint-disable camelcase */
-      shouldCompileTo('{{foo}}', { bar_foo: 'food' }, 'food');
-      /*eslint-enable camelcase */
-    });
-
-    // Tests nameLookup dot vs. bracket behavior.  Bracket is required in certain cases
-    // to avoid errors in older browsers.
-    it('should handle reserved words', function() {
-      shouldCompileTo('{{foo}} {{~null~}}', { foo: 'food' }, 'food');
-    });
-  });
-  describe('#compilerInfo', function() {
-    var $superCheck, $superInfo;
-    beforeEach(function() {
-      $superCheck = handlebarsEnv.VM.checkRevision;
-      $superInfo = handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo;
-    });
-    afterEach(function() {
-      handlebarsEnv.VM.checkRevision = $superCheck;
-      handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = $superInfo;
-    });
-    it('should allow compilerInfo override', function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = function() {
-        return 'crazy';
-      };
-      handlebarsEnv.VM.checkRevision = function(compilerInfo) {
-        if (compilerInfo !== 'crazy') {
-          throw new Error('It didn\'t work');
-        }
-      };
-      shouldCompileTo('{{foo}} ', { foo: 'food' }, 'food ');
-    });
-  });
-  describe('buffer', function() {
-    var $superAppend, $superCreate;
-    beforeEach(function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.forceBuffer = true;
-      $superAppend = handlebarsEnv.JavaScriptCompiler.prototype.appendToBuffer;
-      $superCreate = handlebarsEnv.JavaScriptCompiler.prototype.initializeBuffer;
-    });
-    afterEach(function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.forceBuffer = false;
-      handlebarsEnv.JavaScriptCompiler.prototype.appendToBuffer = $superAppend;
-      handlebarsEnv.JavaScriptCompiler.prototype.initializeBuffer = $superCreate;
-    });
-
-    it('should allow init buffer override', function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.initializeBuffer = function() {
-        return this.quotedString('foo_');
-      };
-      shouldCompileTo('{{foo}} ', { foo: 'food' }, 'foo_food ');
-    });
-    it('should allow append buffer override', function() {
-      handlebarsEnv.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
-        return $superAppend.call(this, [string, ' + "_foo"']);
-      };
-      shouldCompileTo('{{foo}}', { foo: 'food' }, 'food_foo');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/mustache b/lib/handlebars/spec/mustache
deleted file mode 160000
index 72233f3ff..000000000
--- a/lib/handlebars/spec/mustache
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72233f3ffda9e33915fd3022d0a9ebbcce265acd
diff --git a/lib/handlebars/spec/parser.js b/lib/handlebars/spec/parser.js
deleted file mode 100644
index c37887414..000000000
--- a/lib/handlebars/spec/parser.js
+++ /dev/null
@@ -1,234 +0,0 @@
-describe('parser', function() {
-  if (!Handlebars.print) {
-    return;
-  }
-
-  function astFor(template) {
-    var ast = Handlebars.parse(template);
-    return Handlebars.print(ast);
-  }
-
-  it('parses simple mustaches', function() {
-    equals(astFor('{{123}}'), '{{ NUMBER{123} [] }}\n');
-    equals(astFor('{{"foo"}}'), '{{ "foo" [] }}\n');
-    equals(astFor('{{false}}'), '{{ BOOLEAN{false} [] }}\n');
-    equals(astFor('{{true}}'), '{{ BOOLEAN{true} [] }}\n');
-    equals(astFor('{{foo}}'), '{{ PATH:foo [] }}\n');
-    equals(astFor('{{foo?}}'), '{{ PATH:foo? [] }}\n');
-    equals(astFor('{{foo_}}'), '{{ PATH:foo_ [] }}\n');
-    equals(astFor('{{foo-}}'), '{{ PATH:foo- [] }}\n');
-    equals(astFor('{{foo:}}'), '{{ PATH:foo: [] }}\n');
-  });
-
-  it('parses simple mustaches with data', function() {
-    equals(astFor('{{@foo}}'), '{{ @PATH:foo [] }}\n');
-  });
-
-  it('parses simple mustaches with data paths', function() {
-    equals(astFor('{{@../foo}}'), '{{ @PATH:foo [] }}\n');
-  });
-
-  it('parses mustaches with paths', function() {
-    equals(astFor('{{foo/bar}}'), '{{ PATH:foo/bar [] }}\n');
-  });
-
-  it('parses mustaches with this/foo', function() {
-    equals(astFor('{{this/foo}}'), '{{ PATH:foo [] }}\n');
-  });
-
-  it('parses mustaches with - in a path', function() {
-    equals(astFor('{{foo-bar}}'), '{{ PATH:foo-bar [] }}\n');
-  });
-
-  it('parses mustaches with parameters', function() {
-    equals(astFor('{{foo bar}}'), '{{ PATH:foo [PATH:bar] }}\n');
-  });
-
-  it('parses mustaches with string parameters', function() {
-    equals(astFor('{{foo bar \"baz\" }}'), '{{ PATH:foo [PATH:bar, "baz"] }}\n');
-  });
-
-  it('parses mustaches with NUMBER parameters', function() {
-    equals(astFor('{{foo 1}}'), '{{ PATH:foo [NUMBER{1}] }}\n');
-  });
-
-  it('parses mustaches with BOOLEAN parameters', function() {
-    equals(astFor('{{foo true}}'), '{{ PATH:foo [BOOLEAN{true}] }}\n');
-    equals(astFor('{{foo false}}'), '{{ PATH:foo [BOOLEAN{false}] }}\n');
-  });
-
-  it('parses mustaches with undefined and null paths', function() {
-    equals(astFor('{{undefined}}'), '{{ UNDEFINED [] }}\n');
-    equals(astFor('{{null}}'), '{{ NULL [] }}\n');
-  });
-  it('parses mustaches with undefined and null parameters', function() {
-    equals(astFor('{{foo undefined null}}'), '{{ PATH:foo [UNDEFINED, NULL] }}\n');
-  });
-
-  it('parses mutaches with DATA parameters', function() {
-    equals(astFor('{{foo @bar}}'), '{{ PATH:foo [@PATH:bar] }}\n');
-  });
-
-  it('parses mustaches with hash arguments', function() {
-    equals(astFor('{{foo bar=baz}}'), '{{ PATH:foo [] HASH{bar=PATH:baz} }}\n');
-    equals(astFor('{{foo bar=1}}'), '{{ PATH:foo [] HASH{bar=NUMBER{1}} }}\n');
-    equals(astFor('{{foo bar=true}}'), '{{ PATH:foo [] HASH{bar=BOOLEAN{true}} }}\n');
-    equals(astFor('{{foo bar=false}}'), '{{ PATH:foo [] HASH{bar=BOOLEAN{false}} }}\n');
-    equals(astFor('{{foo bar=@baz}}'), '{{ PATH:foo [] HASH{bar=@PATH:baz} }}\n');
-
-    equals(astFor('{{foo bar=baz bat=bam}}'), '{{ PATH:foo [] HASH{bar=PATH:baz, bat=PATH:bam} }}\n');
-    equals(astFor('{{foo bar=baz bat="bam"}}'), '{{ PATH:foo [] HASH{bar=PATH:baz, bat="bam"} }}\n');
-
-    equals(astFor("{{foo bat='bam'}}"), '{{ PATH:foo [] HASH{bat="bam"} }}\n');
-
-    equals(astFor('{{foo omg bar=baz bat=\"bam\"}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam"} }}\n');
-    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=1}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=NUMBER{1}} }}\n');
-    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=true}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=BOOLEAN{true}} }}\n');
-    equals(astFor('{{foo omg bar=baz bat=\"bam\" baz=false}}'), '{{ PATH:foo [PATH:omg] HASH{bar=PATH:baz, bat="bam", baz=BOOLEAN{false}} }}\n');
-  });
-
-  it('parses contents followed by a mustache', function() {
-    equals(astFor('foo bar {{baz}}'), 'CONTENT[ \'foo bar \' ]\n{{ PATH:baz [] }}\n');
-  });
-
-  it('parses a partial', function() {
-    equals(astFor('{{> foo }}'), '{{> PARTIAL:foo }}\n');
-    equals(astFor('{{> "foo" }}'), '{{> PARTIAL:foo }}\n');
-    equals(astFor('{{> 1 }}'), '{{> PARTIAL:1 }}\n');
-  });
-
-  it('parses a partial with context', function() {
-    equals(astFor('{{> foo bar}}'), '{{> PARTIAL:foo PATH:bar }}\n');
-  });
-
-  it('parses a partial with hash', function() {
-    equals(astFor('{{> foo bar=bat}}'), '{{> PARTIAL:foo HASH{bar=PATH:bat} }}\n');
-  });
-
-  it('parses a partial with context and hash', function() {
-    equals(astFor('{{> foo bar bat=baz}}'), '{{> PARTIAL:foo PATH:bar HASH{bat=PATH:baz} }}\n');
-  });
-
-  it('parses a partial with a complex name', function() {
-    equals(astFor('{{> shared/partial?.bar}}'), '{{> PARTIAL:shared/partial?.bar }}\n');
-  });
-
-  it('parses a comment', function() {
-    equals(astFor('{{! this is a comment }}'), "{{! ' this is a comment ' }}\n");
-  });
-
-  it('parses a multi-line comment', function() {
-    equals(astFor('{{!\nthis is a multi-line comment\n}}'), "{{! \'\nthis is a multi-line comment\n\' }}\n");
-  });
-
-  it('parses an inverse section', function() {
-    equals(astFor('{{#foo}} bar {{^}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
-  });
-
-  it('parses an inverse (else-style) section', function() {
-    equals(astFor('{{#foo}} bar {{else}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    CONTENT[ ' baz ' ]\n");
-  });
-
-  it('parses multiple inverse sections', function() {
-    equals(astFor('{{#foo}} bar {{else if bar}}{{else}} baz {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n    BLOCK:\n      PATH:if [PATH:bar]\n      PROGRAM:\n      {{^}}\n        CONTENT[ ' baz ' ]\n");
-  });
-
-  it('parses empty blocks', function() {
-    equals(astFor('{{#foo}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n');
-  });
-
-  it('parses empty blocks with empty inverse section', function() {
-    equals(astFor('{{#foo}}{{^}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n');
-  });
-
-  it('parses empty blocks with empty inverse (else-style) section', function() {
-    equals(astFor('{{#foo}}{{else}}{{/foo}}'), 'BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n');
-  });
-
-  it('parses non-empty blocks with empty inverse section', function() {
-    equals(astFor('{{#foo}} bar {{^}}{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
-  });
-
-  it('parses non-empty blocks with empty inverse (else-style) section', function() {
-    equals(astFor('{{#foo}} bar {{else}}{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    CONTENT[ ' bar ' ]\n  {{^}}\n");
-  });
-
-  it('parses empty blocks with non-empty inverse section', function() {
-    equals(astFor('{{#foo}}{{^}} bar {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
-  });
-
-  it('parses empty blocks with non-empty inverse (else-style) section', function() {
-    equals(astFor('{{#foo}}{{else}} bar {{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    CONTENT[ ' bar ' ]\n");
-  });
-
-  it('parses a standalone inverse section', function() {
-    equals(astFor('{{^foo}}bar{{/foo}}'), "BLOCK:\n  PATH:foo []\n  {{^}}\n    CONTENT[ 'bar' ]\n");
-  });
-  it('throws on old inverse section', function() {
-    shouldThrow(function() {
-      astFor('{{else foo}}bar{{/foo}}');
-    }, Error);
-  });
-
-  it('parses block with block params', function() {
-    equals(astFor('{{#foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n    BLOCK PARAMS: [ bar baz ]\n    CONTENT[ 'content' ]\n");
-  });
-
-  it('parses inverse block with block params', function() {
-    equals(astFor('{{^foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  {{^}}\n    BLOCK PARAMS: [ bar baz ]\n    CONTENT[ 'content' ]\n");
-  });
-  it('parses chained inverse block with block params', function() {
-    equals(astFor('{{#foo}}{{else foo as |bar baz|}}content{{/foo}}'), "BLOCK:\n  PATH:foo []\n  PROGRAM:\n  {{^}}\n    BLOCK:\n      PATH:foo []\n      PROGRAM:\n        BLOCK PARAMS: [ bar baz ]\n        CONTENT[ 'content' ]\n");
-  });
-  it('raises if there\'s a Parse error', function() {
-    shouldThrow(function() {
-      astFor('foo{{^}}bar');
-    }, Error, /Parse error on line 1/);
-    shouldThrow(function() {
-      astFor('{{foo}');
-    }, Error, /Parse error on line 1/);
-    shouldThrow(function() {
-      astFor('{{foo &}}');
-    }, Error, /Parse error on line 1/);
-    shouldThrow(function() {
-      astFor('{{#goodbyes}}{{/hellos}}');
-    }, Error, /goodbyes doesn't match hellos/);
-
-    shouldThrow(function() {
-      astFor('{{{{goodbyes}}}} {{{{/hellos}}}}');
-    }, Error, /goodbyes doesn't match hellos/);
-  });
-
-  it('should handle invalid paths', function() {
-    shouldThrow(function() {
-      astFor('{{foo/../bar}}');
-    }, Error, /Invalid path: foo\/\.\. - 1:2/);
-    shouldThrow(function() {
-      astFor('{{foo/./bar}}');
-    }, Error, /Invalid path: foo\/\. - 1:2/);
-    shouldThrow(function() {
-      astFor('{{foo/this/bar}}');
-    }, Error, /Invalid path: foo\/this - 1:2/);
-  });
-
-  it('knows how to report the correct line number in errors', function() {
-    shouldThrow(function() {
-      astFor('hello\nmy\n{{foo}');
-    }, Error, /Parse error on line 3/);
-    shouldThrow(function() {
-      astFor('hello\n\nmy\n\n{{foo}');
-    }, Error, /Parse error on line 5/);
-  });
-
-  it('knows how to report the correct line number in errors when the first character is a newline', function() {
-    shouldThrow(function() {
-      astFor('\n\nhello\n\nmy\n\n{{foo}');
-    }, Error, /Parse error on line 7/);
-  });
-
-  describe('externally compiled AST', function() {
-    it('can pass through an already-compiled AST', function() {
-      equals(astFor(new Handlebars.AST.Program([new Handlebars.AST.ContentStatement('Hello')], null)), 'CONTENT[ \'Hello\' ]\n');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/partials.js b/lib/handlebars/spec/partials.js
deleted file mode 100644
index 22d2dc959..000000000
--- a/lib/handlebars/spec/partials.js
+++ /dev/null
@@ -1,247 +0,0 @@
-describe('partials', function() {
-  it('basic partials', function() {
-    var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
-    var partial = '{{name}} ({{url}}) ';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial},, false], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-  });
-
-  it('dynamic partials', function() {
-    var string = 'Dudes: {{#dudes}}{{> (partial)}}{{/dudes}}';
-    var partial = '{{name}} ({{url}}) ';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    var helpers = {
-      partial: function() {
-        return 'dude';
-      }
-    };
-    shouldCompileToWithPartials(string, [hash, helpers, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-    shouldCompileToWithPartials(string, [hash, helpers, {dude: partial},, false], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-  });
-  it('failing dynamic partials', function() {
-    var string = 'Dudes: {{#dudes}}{{> (partial)}}{{/dudes}}';
-    var partial = '{{name}} ({{url}}) ';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    var helpers = {
-      partial: function() {
-        return 'missing';
-      }
-    };
-    shouldThrow(function() {
-      shouldCompileToWithPartials(string, [hash, helpers, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ');
-    }, Handlebars.Exception, 'The partial missing could not be found');
-  });
-
-  it('partials with context', function() {
-    var string = 'Dudes: {{>dude dudes}}';
-    var partial = '{{#this}}{{name}} ({{url}}) {{/this}}';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ',
-                    'Partials can be passed a context');
-  });
-
-  it('partials with undefined context', function() {
-    var string = 'Dudes: {{>dude dudes}}';
-    var partial = '{{foo}} Empty';
-    var hash = {};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes:  Empty');
-  });
-
-  it('partials with duplicate parameters', function() {
-    shouldThrow(function() {
-      CompilerContext.compile('Dudes: {{>dude dudes foo bar=baz}}');
-    }, Error, 'Unsupported number of partial arguments: 2 - 1:7');
-  });
-
-  it('partials with parameters', function() {
-    var string = 'Dudes: {{#dudes}}{{> dude others=..}}{{/dudes}}';
-    var partial = '{{others.foo}}{{name}} ({{url}}) ';
-    var hash = {foo: 'bar', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: barYehuda (http://yehuda) barAlan (http://alan) ',
-                    'Basic partials output based on current context.');
-  });
-
-  it('partial in a partial', function() {
-    var string = 'Dudes: {{#dudes}}{{>dude}}{{/dudes}}';
-    var dude = '{{name}} {{> url}} ';
-    var url = '<a href="{{url}}">{{url}}</a>';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}], true, 'Dudes: Yehuda <a href="http://yehuda">http://yehuda</a> Alan <a href="http://alan">http://alan</a> ', 'Partials are rendered inside of other partials');
-  });
-
-  it('rendering undefined partial throws an exception', function() {
-    shouldThrow(function() {
-      var template = CompilerContext.compile('{{> whatever}}');
-      template();
-    }, Handlebars.Exception, 'The partial whatever could not be found');
-  });
-
-  it('registering undefined partial throws an exception', function() {
-    shouldThrow(function() {
-      var undef;
-      handlebarsEnv.registerPartial('undefined_test', undef);
-    }, Handlebars.Exception, 'Attempting to register a partial as undefined');
-  });
-
-  it('rendering template partial in vm mode throws an exception', function() {
-    shouldThrow(function() {
-      var template = CompilerContext.compile('{{> whatever}}');
-      template();
-    }, Handlebars.Exception, 'The partial whatever could not be found');
-  });
-
-  it('rendering function partial in vm mode', function() {
-    var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
-    function partial(context) {
-      return context.name + ' (' + context.url + ') ';
-    }
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileTo(string, [hash, {}, {dude: partial}], 'Dudes: Yehuda (http://yehuda) Alan (http://alan) ',
-                    'Function partials output based in VM.');
-  });
-
-  it('GH-14: a partial preceding a selector', function() {
-    var string = 'Dudes: {{>dude}} {{anotherDude}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: dude}], true, 'Dudes: Jeepers Creepers', 'Regular selectors can follow a partial');
-  });
-
-  it('Partials with slash paths', function() {
-    var string = 'Dudes: {{> shared/dude}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
-  });
-
-  it('Partials with slash and point paths', function() {
-    var string = 'Dudes: {{> shared/dude.thing}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude.thing': dude}], true, 'Dudes: Jeepers', 'Partials can use literal with points in paths');
-  });
-
-  it('Global Partials', function() {
-    handlebarsEnv.registerPartial('globalTest', '{{anotherDude}}');
-
-    var string = 'Dudes: {{> shared/dude}} {{> globalTest}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'shared/dude': dude}], true, 'Dudes: Jeepers Creepers', 'Partials can use globals or passed');
-
-    handlebarsEnv.unregisterPartial('globalTest');
-    equals(handlebarsEnv.partials.globalTest, undefined);
-  });
-
-  it('Multiple partial registration', function() {
-    handlebarsEnv.registerPartial({
-      'shared/dude': '{{name}}',
-      globalTest: '{{anotherDude}}'
-    });
-
-    var string = 'Dudes: {{> shared/dude}} {{> globalTest}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash], true, 'Dudes: Jeepers Creepers', 'Partials can use globals or passed');
-  });
-
-  it('Partials with integer path', function() {
-    var string = 'Dudes: {{> 404}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {404: dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
-  });
-
-  it('Partials with complex path', function() {
-    var string = 'Dudes: {{> 404/asdf?.bar}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
-  });
-
-  it('Partials with escaped', function() {
-    var string = 'Dudes: {{> [+404/asdf?.bar]}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
-  });
-
-  it('Partials with string', function() {
-    var string = 'Dudes: {{> \'+404/asdf?.bar\'}}';
-    var dude = '{{name}}';
-    var hash = {name: 'Jeepers', anotherDude: 'Creepers'};
-    shouldCompileToWithPartials(string, [hash, {}, {'+404/asdf?.bar': dude}], true, 'Dudes: Jeepers', 'Partials can use literal paths');
-  });
-
-  it('should handle empty partial', function() {
-    var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
-    var partial = '';
-    var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-    shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, 'Dudes: ');
-  });
-
-  it('throw on missing partial', function() {
-    var compile = handlebarsEnv.compile;
-    handlebarsEnv.compile = undefined;
-    shouldThrow(function() {
-      shouldCompileTo('{{> dude}}', [{}, {}, {dude: 'fail'}], '');
-    }, Error, /The partial dude could not be compiled/);
-    handlebarsEnv.compile = compile;
-  });
-
-  it('should pass compiler flags', function() {
-    if (Handlebars.compile) {
-      var env = Handlebars.create();
-      env.registerPartial('partial', '{{foo}}');
-      var template = env.compile('{{foo}} {{> partial}}', {noEscape: true});
-      equal(template({foo: '<'}), '< <');
-    }
-  });
-
-  describe('standalone partials', function() {
-    it('indented partials', function() {
-      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
-      var dude = '{{name}}\n';
-      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: dude}], true,
-            'Dudes:\n  Yehuda\n  Alan\n');
-    });
-    it('nested indented partials', function() {
-      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
-      var dude = '{{name}}\n {{> url}}';
-      var url = '{{url}}!\n';
-      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}], true,
-            'Dudes:\n  Yehuda\n   http://yehuda!\n  Alan\n   http://alan!\n');
-    });
-    it('prevent nested indented partials', function() {
-      var string = 'Dudes:\n{{#dudes}}\n  {{>dude}}\n{{/dudes}}';
-      var dude = '{{name}}\n {{> url}}';
-      var url = '{{url}}!\n';
-      var hash = {dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: dude, url: url}, {preventIndent: true}], true,
-            'Dudes:\n  Yehuda\n http://yehuda!\n  Alan\n http://alan!\n');
-    });
-  });
-
-  describe('compat mode', function() {
-    it('partials can access parents', function() {
-      var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
-      var partial = '{{name}} ({{url}}) {{root}} ';
-      var hash = {root: 'yes', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: partial}, true], true, 'Dudes: Yehuda (http://yehuda) yes Alan (http://alan) yes ');
-    });
-    it('partials can access parents without data', function() {
-      var string = 'Dudes: {{#dudes}}{{> dude}}{{/dudes}}';
-      var partial = '{{name}} ({{url}}) {{root}} ';
-      var hash = {root: 'yes', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: partial}, true, false], true, 'Dudes: Yehuda (http://yehuda) yes Alan (http://alan) yes ');
-    });
-    it('partials inherit compat', function() {
-      var string = 'Dudes: {{> dude}}';
-      var partial = '{{#dudes}}{{name}} ({{url}}) {{root}} {{/dudes}}';
-      var hash = {root: 'yes', dudes: [{name: 'Yehuda', url: 'http://yehuda'}, {name: 'Alan', url: 'http://alan'}]};
-      shouldCompileToWithPartials(string, [hash, {}, {dude: partial}, true], true, 'Dudes: Yehuda (http://yehuda) yes Alan (http://alan) yes ');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/precompiler.js b/lib/handlebars/spec/precompiler.js
deleted file mode 100644
index 21e25b06e..000000000
--- a/lib/handlebars/spec/precompiler.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*eslint-disable no-console */
-describe('precompiler', function() {
-  // NOP Under non-node environments
-  if (typeof process === 'undefined') {
-    return;
-  }
-
-  var Handlebars = require('../lib'),
-      Precompiler = require('../dist/cjs/precompiler'),
-      fs = require('fs'),
-      uglify = require('uglify-js');
-
-  var log,
-      logFunction,
-
-      precompile,
-      minify,
-
-      file,
-      content,
-      writeFileSync;
-
-  beforeEach(function() {
-    precompile = Handlebars.precompile;
-    minify = uglify.minify;
-    writeFileSync = fs.writeFileSync;
-
-    logFunction = console.log;
-    log = '';
-    console.log = function() {
-      log += Array.prototype.join.call(arguments, '');
-    };
-    fs.writeFileSync = function(_file, _content) {
-      file = _file;
-      content = _content;
-    };
-  });
-  afterEach(function() {
-    Handlebars.precompile = precompile;
-    uglify.minify = minify;
-    fs.writeFileSync = writeFileSync;
-    console.log = logFunction;
-  });
-
-  it('should output version', function() {
-    Precompiler.cli({templates: [], version: true});
-    equals(log, Handlebars.VERSION);
-  });
-  it('should throw if lacking templates', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: []});
-    }, Handlebars.Exception, 'Must define at least one template or directory.');
-  });
-  it('should throw on missing template', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: ['foo']});
-    }, Handlebars.Exception, 'Unable to open template file "foo"');
-  });
-  it('should throw when combining simple and minimized', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: [__dirname], simple: true, min: true});
-    }, Handlebars.Exception, 'Unable to minimize simple output');
-  });
-  it('should throw when combining simple and multiple templates', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars', __dirname + '/artifacts/empty.handlebars'], simple: true});
-    }, Handlebars.Exception, 'Unable to output multiple templates in simple mode');
-  });
-  it('should throw when combining simple and directories', function() {
-    shouldThrow(function() {
-      Precompiler.cli({templates: [__dirname], simple: true});
-    }, Handlebars.Exception, 'Unable to output multiple templates in simple mode');
-  });
-  it('should enumerate directories by extension', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'hbs'});
-    equal(/'example_2'/.test(log), true);
-    log = '';
-
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'handlebars'});
-    equal(/'empty'/.test(log), true);
-    equal(/'example_1'/.test(log), true);
-  });
-  it('should protect from regexp patterns', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts'], extension: 'hb(s'});
-    // Success is not throwing
-  });
-  it('should output simple templates', function() {
-    Handlebars.precompile = function() { return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars'});
-    equal(log, 'simple\n');
-  });
-  it('should output amd templates', function() {
-    Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], amd: true, extension: 'handlebars'});
-    equal(/template\(amd\)/.test(log), true);
-  });
-  it('should output multiple amd', function() {
-    Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts'], amd: true, extension: 'handlebars', namespace: 'foo'});
-    equal(/templates = foo = foo \|\|/.test(log), true);
-    equal(/return templates/.test(log), true);
-    equal(/template\(amd\)/.test(log), true);
-  });
-  it('should output amd partials', function() {
-    Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], amd: true, partial: true, extension: 'handlebars'});
-    equal(/return Handlebars\.partials\['empty'\]/.test(log), true);
-    equal(/template\(amd\)/.test(log), true);
-  });
-  it('should output multiple amd partials', function() {
-    Handlebars.precompile = function() { return 'amd'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts'], amd: true, partial: true, extension: 'handlebars'});
-    equal(/return Handlebars\.partials\[/.test(log), false);
-    equal(/template\(amd\)/.test(log), true);
-  });
-  it('should output commonjs templates', function() {
-    Handlebars.precompile = function() { return 'commonjs'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], commonjs: true, extension: 'handlebars'});
-    equal(/template\(commonjs\)/.test(log), true);
-  });
-
-  it('should set data flag', function() {
-    Handlebars.precompile = function(data, options) { equal(options.data, true); return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', data: true});
-    equal(log, 'simple\n');
-  });
-
-  it('should set known helpers', function() {
-    Handlebars.precompile = function(data, options) { equal(options.knownHelpers.foo, true); return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', known: 'foo'});
-    equal(log, 'simple\n');
-  });
-
-  it('should handle different root', function() {
-    Handlebars.precompile = function() { return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', root: 'foo/'});
-    equal(log, 'simple\n');
-  });
-  it('should output to file system', function() {
-    Handlebars.precompile = function() { return 'simple'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], simple: true, extension: 'handlebars', output: 'file!'});
-    equal(file, 'file!');
-    equal(content, 'simple\n');
-    equal(log, '');
-  });
-  it('should handle BOM', function() {
-    Handlebars.precompile = function(template) { return template === 'a' ? 'simple' : 'fail'; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/bom.handlebars'], simple: true, extension: 'handlebars', bom: true});
-    equal(log, 'simple\n');
-  });
-
-  it('should output minimized templates', function() {
-    Handlebars.precompile = function() { return 'amd'; };
-    uglify.minify = function() { return {code: 'min'}; };
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], min: true, extension: 'handlebars'});
-    equal(log, 'min');
-  });
-
-  it('should output map', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], map: 'foo.js.map', extension: 'handlebars'});
-
-    equal(file, 'foo.js.map');
-    equal(/sourceMappingURL=/.test(log), true);
-  });
-
-  it('should output map', function() {
-    Precompiler.cli({templates: [__dirname + '/artifacts/empty.handlebars'], min: true, map: 'foo.js.map', extension: 'handlebars'});
-
-    equal(file, 'foo.js.map');
-    equal(/sourceMappingURL=/.test(log), true);
-  });
-});
diff --git a/lib/handlebars/spec/regressions.js b/lib/handlebars/spec/regressions.js
deleted file mode 100644
index 247c1c9b3..000000000
--- a/lib/handlebars/spec/regressions.js
+++ /dev/null
@@ -1,175 +0,0 @@
-describe('Regressions', function() {
-  it('GH-94: Cannot read property of undefined', function() {
-    var data = {
-      'books': [{
-        'title': 'The origin of species',
-        'author': {
-          'name': 'Charles Darwin'
-        }
-      }, {
-        'title': 'Lazarillo de Tormes'
-      }]
-    };
-    var string = '{{#books}}{{title}}{{author.name}}{{/books}}';
-    shouldCompileTo(string, data, 'The origin of speciesCharles DarwinLazarillo de Tormes',
-                    'Renders without an undefined property error');
-  });
-
-  it("GH-150: Inverted sections print when they shouldn't", function() {
-    var string = '{{^set}}not set{{/set}} :: {{#set}}set{{/set}}';
-
-    shouldCompileTo(string, {}, 'not set :: ', "inverted sections run when property isn't present in context");
-    shouldCompileTo(string, {set: undefined}, 'not set :: ', 'inverted sections run when property is undefined');
-    shouldCompileTo(string, {set: false}, 'not set :: ', 'inverted sections run when property is false');
-    shouldCompileTo(string, {set: true}, ' :: set', "inverted sections don't run when property is true");
-  });
-
-  it('GH-158: Using array index twice, breaks the template', function() {
-    var string = '{{arr.[0]}}, {{arr.[1]}}';
-    var data = { 'arr': [1, 2] };
-
-    shouldCompileTo(string, data, '1, 2', 'it works as expected');
-  });
-
-  it("bug reported by @fat where lambdas weren't being properly resolved", function() {
-    var string = '<strong>This is a slightly more complicated {{thing}}.</strong>.\n'
-        + '{{! Just ignore this business. }}\n'
-        + 'Check this out:\n'
-        + '{{#hasThings}}\n'
-        + '<ul>\n'
-        + '{{#things}}\n'
-        + '<li class={{className}}>{{word}}</li>\n'
-        + '{{/things}}</ul>.\n'
-        + '{{/hasThings}}\n'
-        + '{{^hasThings}}\n'
-        + '\n'
-        + '<small>Nothing to check out...</small>\n'
-        + '{{/hasThings}}';
-    var data = {
-      thing: function() {
-        return 'blah';
-      },
-      things: [
-        {className: 'one', word: '@fat'},
-        {className: 'two', word: '@dhg'},
-        {className: 'three', word: '@sayrer'}
-      ],
-      hasThings: function() {
-        return true;
-      }
-    };
-
-    var output = '<strong>This is a slightly more complicated blah.</strong>.\n'
-        + 'Check this out:\n'
-        + '<ul>\n'
-        + '<li class=one>@fat</li>\n'
-        + '<li class=two>@dhg</li>\n'
-        + '<li class=three>@sayrer</li>\n'
-        + '</ul>.\n';
-    shouldCompileTo(string, data, output);
-  });
-
-  it('GH-408: Multiple loops fail', function() {
-    var context = [
-      { name: 'John Doe', location: { city: 'Chicago' } },
-      { name: 'Jane Doe', location: { city: 'New York'} }
-    ];
-
-    var template = CompilerContext.compile('{{#.}}{{name}}{{/.}}{{#.}}{{name}}{{/.}}{{#.}}{{name}}{{/.}}');
-
-    var result = template(context);
-    equals(result, 'John DoeJane DoeJohn DoeJane DoeJohn DoeJane Doe', 'It should output multiple times');
-  });
-
-  it('GS-428: Nested if else rendering', function() {
-    var succeedingTemplate = '{{#inverse}} {{#blk}} Unexpected {{/blk}} {{else}}  {{#blk}} Expected {{/blk}} {{/inverse}}';
-    var failingTemplate = '{{#inverse}} {{#blk}} Unexpected {{/blk}} {{else}} {{#blk}} Expected {{/blk}} {{/inverse}}';
-
-    var helpers = {
-      blk: function(block) { return block.fn(''); },
-      inverse: function(block) { return block.inverse(''); }
-    };
-
-    shouldCompileTo(succeedingTemplate, [{}, helpers], '   Expected  ');
-    shouldCompileTo(failingTemplate, [{}, helpers], '  Expected  ');
-  });
-
-  it('GH-458: Scoped this identifier', function() {
-    shouldCompileTo('{{./foo}}', {foo: 'bar'}, 'bar');
-  });
-
-  it('GH-375: Unicode line terminators', function() {
-    shouldCompileTo('\u2028', {}, '\u2028');
-  });
-
-  it('GH-534: Object prototype aliases', function() {
-    /*eslint-disable no-extend-native */
-    Object.prototype[0xD834] = true;
-
-    shouldCompileTo('{{foo}}', { foo: 'bar' }, 'bar');
-
-    delete Object.prototype[0xD834];
-    /*eslint-enable no-extend-native */
-  });
-
-  it('GH-437: Matching escaping', function() {
-    shouldThrow(function() {
-      CompilerContext.compile('{{{a}}');
-    }, Error);
-    shouldThrow(function() {
-      CompilerContext.compile('{{a}}}');
-    }, Error);
-  });
-
-  it('GH-676: Using array in escaping mustache fails', function() {
-    var string = '{{arr}}';
-    var data = { 'arr': [1, 2] };
-
-    shouldCompileTo(string, data, data.arr.toString(), 'it works as expected');
-  });
-
-  it('Mustache man page', function() {
-    var string = 'Hello {{name}}. You have just won ${{value}}!{{#in_ca}} Well, ${{taxed_value}}, after taxes.{{/in_ca}}';
-    var data = {
-      'name': 'Chris',
-      'value': 10000,
-      'taxed_value': 10000 - (10000 * 0.4),
-      'in_ca': true
-    };
-
-    shouldCompileTo(string, data, 'Hello Chris. You have just won $10000! Well, $6000, after taxes.', 'the hello world mustache example works');
-  });
-
-  it('GH-731: zero context rendering', function() {
-    shouldCompileTo('{{#foo}} This is {{bar}} ~ {{/foo}}', {foo: 0, bar: 'OK'}, ' This is  ~ ');
-  });
-
-  it('GH-820: zero pathed rendering', function() {
-    shouldCompileTo('{{foo.bar}}', {foo: 0}, '');
-  });
-
-  it('GH-837: undefined values for helpers', function() {
-    var helpers = {
-      str: function(value) { return value + ''; }
-    };
-
-    shouldCompileTo('{{str bar.baz}}', [{}, helpers], 'undefined');
-  });
-
-  it('GH-926: Depths and de-dupe', function() {
-    var context = {
-      name: 'foo',
-      data: [
-        1
-      ],
-      notData: [
-        1
-      ]
-    };
-
-    var template = CompilerContext.compile('{{#if dater}}{{#each data}}{{../name}}{{/each}}{{else}}{{#each notData}}{{../name}}{{/each}}{{/if}}');
-
-    var result = template(context);
-    equals(result, 'foo');
-  });
-});
diff --git a/lib/handlebars/spec/require.js b/lib/handlebars/spec/require.js
deleted file mode 100644
index 6c0b5ae46..000000000
--- a/lib/handlebars/spec/require.js
+++ /dev/null
@@ -1,23 +0,0 @@
-if (typeof require !== 'undefined' && require.extensions['.handlebars']) {
-  describe('Require', function() {
-    it('Load .handlebars files with require()', function() {
-      var template = require('./artifacts/example_1');
-      equal(template, require('./artifacts/example_1.handlebars'));
-
-      var expected = 'foo\n';
-      var result = template({foo: 'foo'});
-
-      equal(result, expected);
-    });
-
-    it('Load .hbs files with require()', function() {
-      var template = require('./artifacts/example_2');
-      equal(template, require('./artifacts/example_2.hbs'));
-
-      var expected = 'Hello, World!\n';
-      var result = template({name: 'World'});
-
-      equal(result, expected);
-    });
-  });
-}
diff --git a/lib/handlebars/spec/runtime.js b/lib/handlebars/spec/runtime.js
deleted file mode 100644
index 502a8436b..000000000
--- a/lib/handlebars/spec/runtime.js
+++ /dev/null
@@ -1,89 +0,0 @@
-describe('runtime', function() {
-  describe('#template', function() {
-    it('should throw on invalid templates', function() {
-      shouldThrow(function() {
-        Handlebars.template({});
-      }, Error, 'Unknown template object: object');
-      shouldThrow(function() {
-        Handlebars.template();
-      }, Error, 'Unknown template object: undefined');
-      shouldThrow(function() {
-        Handlebars.template('');
-      }, Error, 'Unknown template object: string');
-    });
-    it('should throw on version mismatch', function() {
-      shouldThrow(function() {
-        Handlebars.template({
-          main: true,
-          compiler: [Handlebars.COMPILER_REVISION + 1]
-        });
-      }, Error, /Template was precompiled with a newer version of Handlebars than the current runtime/);
-      shouldThrow(function() {
-        Handlebars.template({
-          main: true,
-          compiler: [Handlebars.COMPILER_REVISION - 1]
-        });
-      }, Error, /Template was precompiled with an older version of Handlebars than the current runtime/);
-      shouldThrow(function() {
-        Handlebars.template({
-          main: true
-        });
-      }, Error, /Template was precompiled with an older version of Handlebars than the current runtime/);
-    });
-  });
-
-  describe('#child', function() {
-    if (!Handlebars.compile) {
-      return;
-    }
-
-    it('should throw for depthed methods without depths', function() {
-      shouldThrow(function() {
-        var template = Handlebars.compile('{{#foo}}{{../bar}}{{/foo}}');
-        // Calling twice to hit the non-compiled case.
-        template._setup({});
-        template._setup({});
-        template._child(1);
-      }, Error, 'must pass parent depths');
-    });
-
-    it('should throw for block param methods without params', function() {
-      shouldThrow(function() {
-        var template = Handlebars.compile('{{#foo as |foo|}}{{foo}}{{/foo}}');
-        // Calling twice to hit the non-compiled case.
-        template._setup({});
-        template._setup({});
-        template._child(1);
-      }, Error, 'must pass block params');
-    });
-    it('should expose child template', function() {
-      var template = Handlebars.compile('{{#foo}}bar{{/foo}}');
-        // Calling twice to hit the non-compiled case.
-      equal(template._child(1)(), 'bar');
-      equal(template._child(1)(), 'bar');
-    });
-    it('should render depthed content', function() {
-      var template = Handlebars.compile('{{#foo}}{{../bar}}{{/foo}}');
-        // Calling twice to hit the non-compiled case.
-      equal(template._child(1, undefined, [], [{bar: 'baz'}])(), 'baz');
-    });
-  });
-
-  describe('#noConflict', function() {
-    if (!CompilerContext.browser) {
-      return;
-    }
-
-    it('should reset on no conflict', function() {
-      var reset = Handlebars;
-      Handlebars.noConflict();
-      equal(Handlebars, 'no-conflict');
-
-      Handlebars = 'really, none';
-      reset.noConflict();
-      equal(Handlebars, 'really, none');
-
-      Handlebars = reset;
-    });
-  });
-});
diff --git a/lib/handlebars/spec/source-map.js b/lib/handlebars/spec/source-map.js
deleted file mode 100644
index 54e5e4d91..000000000
--- a/lib/handlebars/spec/source-map.js
+++ /dev/null
@@ -1,50 +0,0 @@
-try {
-  if (typeof define !== 'function' || !define.amd) {
-    var SourceMap = require('source-map'),
-         SourceMapConsumer = SourceMap.SourceMapConsumer;
-  }
-} catch (err) {
-  /* NOP for in browser */
-}
-
-describe('source-map', function() {
-  if (!Handlebars.precompile || !SourceMap) {
-    return;
-  }
-
-  it('should safely include source map info', function() {
-    var template = Handlebars.precompile('{{hello}}', {destName: 'dest.js', srcName: 'src.hbs'});
-
-    equal(!!template.code, true);
-    equal(!!template.map, !CompilerContext.browser);
-  });
-  it('should map source properly', function() {
-    var templateSource = '  b{{hello}}  \n  {{bar}}a {{#block arg hash=(subex 1 subval)}}{{/block}}',
-        template = Handlebars.precompile(templateSource, {destName: 'dest.js', srcName: 'src.hbs'});
-
-    if (template.map) {
-      var consumer = new SourceMapConsumer(template.map),
-          lines = template.code.split('\n'),
-          srcLines = templateSource.split('\n'),
-
-          generated = grepLine('"  b"', lines),
-          source = grepLine('  b', srcLines);
-
-      var mapped = consumer.originalPositionFor(generated);
-      equal(mapped.line, source.line);
-      equal(mapped.column, source.column);
-    }
-  });
-});
-
-function grepLine(token, lines) {
-  for (var i = 0; i < lines.length; i++) {
-    var column = lines[i].indexOf(token);
-    if (column >= 0) {
-      return {
-        line: i + 1,
-        column: column
-      };
-    }
-  }
-}
diff --git a/lib/handlebars/spec/spec.js b/lib/handlebars/spec/spec.js
deleted file mode 100644
index ae1ec3805..000000000
--- a/lib/handlebars/spec/spec.js
+++ /dev/null
@@ -1,50 +0,0 @@
-describe('spec', function() {
-  // NOP Under non-node environments
-  if (typeof process === 'undefined') {
-    return;
-  }
-
-  var _ = require('underscore'),
-      fs = require('fs');
-
-  var specDir = __dirname + '/mustache/specs/';
-  var specs = _.filter(fs.readdirSync(specDir), function(name) {
-    return (/.*\.json$/).test(name);
-  });
-
-  _.each(specs, function(name) {
-    var spec = require(specDir + name);
-    _.each(spec.tests, function(test) {
-      // Our lambda implementation knowingly deviates from the optional Mustace lambda spec
-      // We also do not support alternative delimeters
-      if (name === '~lambdas.json'
-
-          // We also choose to throw if paritals are not found
-          || (name === 'partials.json' && test.name === 'Failed Lookup')
-
-          // We nest the entire response from partials, not just the literals
-          || (name === 'partials.json' && test.name === 'Standalone Indentation')
-
-          || (/\{\{\=/).test(test.template)
-          || _.any(test.partials, function(partial) { return (/\{\{\=/).test(partial); })) {
-        it.skip(name + ' - ' + test.name);
-        return;
-      }
-
-      var data = _.clone(test.data);
-      if (data.lambda) {
-        // Blergh
-        /*eslint-disable no-eval */
-        data.lambda = eval('(' + data.lambda.js + ')');
-        /*eslint-enable no-eval */
-      }
-      it(name + ' - ' + test.name, function() {
-        if (test.partials) {
-          shouldCompileToWithPartials(test.template, [data, {}, test.partials, true], true, test.expected, test.desc + ' "' + test.template + '"');
-        } else {
-          shouldCompileTo(test.template, [data, {}, {}, true], test.expected, test.desc + ' "' + test.template + '"');
-        }
-      });
-    });
-  });
-});
diff --git a/lib/handlebars/spec/strict.js b/lib/handlebars/spec/strict.js
deleted file mode 100644
index 2aef13442..000000000
--- a/lib/handlebars/spec/strict.js
+++ /dev/null
@@ -1,123 +0,0 @@
-var Exception = Handlebars.Exception;
-
-describe('strict', function() {
-  describe('strict mode', function() {
-    it('should error on missing property lookup', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello}}', {strict: true});
-
-        template({});
-      }, Exception, /"hello" not defined in/);
-    });
-    it('should error on missing child', function() {
-      var template = CompilerContext.compile('{{hello.bar}}', {strict: true});
-      equals(template({hello: {bar: 'foo'}}), 'foo');
-
-      shouldThrow(function() {
-        template({hello: {}});
-      }, Exception, /"bar" not defined in/);
-    });
-    it('should handle explicit undefined', function() {
-      var template = CompilerContext.compile('{{hello.bar}}', {strict: true});
-
-      equals(template({hello: {bar: undefined}}), '');
-    });
-    it('should error on missing property lookup in known helpers mode', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello}}', {strict: true, knownHelpersOnly: true});
-
-        template({});
-      }, Exception, /"hello" not defined in/);
-    });
-    it('should error on missing context', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello}}', {strict: true});
-
-        template();
-      }, Error);
-    });
-
-    it('should error on missing data lookup', function() {
-      var template = CompilerContext.compile('{{@hello}}', {strict: true});
-      equals(template(undefined, {data: {hello: 'foo'}}), 'foo');
-
-      shouldThrow(function() {
-        template();
-      }, Error);
-    });
-
-    it('should not run helperMissing for helper calls', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello foo}}', {strict: true});
-
-        template({foo: true});
-      }, Exception, /"hello" not defined in/);
-
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{#hello foo}}{{/hello}}', {strict: true});
-
-        template({foo: true});
-      }, Exception, /"hello" not defined in/);
-    });
-    it('should throw on ambiguous blocks', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{#hello}}{{/hello}}', {strict: true});
-
-        template({});
-      }, Exception, /"hello" not defined in/);
-
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{^hello}}{{/hello}}', {strict: true});
-
-        template({});
-      }, Exception, /"hello" not defined in/);
-
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{#hello.bar}}{{/hello.bar}}', {strict: true});
-
-        template({hello: {}});
-      }, Exception, /"bar" not defined in/);
-    });
-  });
-
-  describe('assume objects', function() {
-    it('should ignore missing property', function() {
-      var template = CompilerContext.compile('{{hello}}', {assumeObjects: true});
-
-      equal(template({}), '');
-    });
-    it('should ignore missing child', function() {
-      var template = CompilerContext.compile('{{hello.bar}}', {assumeObjects: true});
-
-      equal(template({hello: {}}), '');
-    });
-    it('should error on missing object', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello.bar}}', {assumeObjects: true});
-
-        template({});
-      }, Error);
-    });
-    it('should error on missing context', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{hello}}', {assumeObjects: true});
-
-        template();
-      }, Error);
-    });
-
-    it('should error on missing data lookup', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('{{@hello.bar}}', {assumeObjects: true});
-
-        template();
-      }, Error);
-    });
-
-    it('should execute blockHelperMissing', function() {
-      var template = CompilerContext.compile('{{^hello}}foo{{/hello}}', {assumeObjects: true});
-
-      equals(template({}), 'foo');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/string-params.js b/lib/handlebars/spec/string-params.js
deleted file mode 100644
index b76f291f7..000000000
--- a/lib/handlebars/spec/string-params.js
+++ /dev/null
@@ -1,176 +0,0 @@
-describe('string params mode', function() {
-  it('arguments to helpers can be retrieved from options hash in string form', function() {
-    var template = CompilerContext.compile('{{wycats is.a slave.driver}}', {stringParams: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun) {
-        return 'HELP ME MY BOSS ' + passiveVoice + ' ' + noun;
-      }
-    };
-
-    var result = template({}, {helpers: helpers});
-
-    equals(result, 'HELP ME MY BOSS is.a slave.driver', 'String parameters output');
-  });
-
-  it('when using block form, arguments to helpers can be retrieved from options hash in string form', function() {
-    var template = CompilerContext.compile('{{#wycats is.a slave.driver}}help :({{/wycats}}', {stringParams: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        return 'HELP ME MY BOSS ' + passiveVoice + ' ' +
-                noun + ': ' + options.fn(this);
-      }
-    };
-
-    var result = template({}, {helpers: helpers});
-
-    equals(result, 'HELP ME MY BOSS is.a slave.driver: help :(', 'String parameters output');
-  });
-
-  it('when inside a block in String mode, .. passes the appropriate context in the options hash', function() {
-    var template = CompilerContext.compile('{{#with dale}}{{tomdale ../need dad.joke}}{{/with}}', {stringParams: true});
-
-    var helpers = {
-      tomdale: function(desire, noun, options) {
-        return 'STOP ME FROM READING HACKER NEWS I ' +
-                options.contexts[0][desire] + ' ' + noun;
-      },
-
-      'with': function(context, options) {
-        return options.fn(options.contexts[0][context]);
-      }
-    };
-
-    var result = template({
-      dale: {},
-
-      need: 'need-a'
-    }, {helpers: helpers});
-
-    equals(result, 'STOP ME FROM READING HACKER NEWS I need-a dad.joke', 'Proper context variable output');
-  });
-
-  it('information about the types is passed along', function() {
-    var template = CompilerContext.compile("{{tomdale 'need' dad.joke true false}}", { stringParams: true });
-
-    var helpers = {
-      tomdale: function(desire, noun, trueBool, falseBool, options) {
-        equal(options.types[0], 'StringLiteral', 'the string type is passed');
-        equal(options.types[1], 'PathExpression', 'the expression type is passed');
-        equal(options.types[2], 'BooleanLiteral', 'the expression type is passed');
-        equal(desire, 'need', 'the string form is passed for strings');
-        equal(noun, 'dad.joke', 'the string form is passed for expressions');
-        equal(trueBool, true, 'raw booleans are passed through');
-        equal(falseBool, false, 'raw booleans are passed through');
-        return 'Helper called';
-      }
-    };
-
-    var result = template({}, { helpers: helpers });
-    equal(result, 'Helper called');
-  });
-
-  it('hash parameters get type information', function() {
-    var template = CompilerContext.compile("{{tomdale he.says desire='need' noun=dad.joke bool=true}}", { stringParams: true });
-
-    var helpers = {
-      tomdale: function(exclamation, options) {
-        equal(exclamation, 'he.says');
-        equal(options.types[0], 'PathExpression');
-
-        equal(options.hashTypes.desire, 'StringLiteral');
-        equal(options.hashTypes.noun, 'PathExpression');
-        equal(options.hashTypes.bool, 'BooleanLiteral');
-        equal(options.hash.desire, 'need');
-        equal(options.hash.noun, 'dad.joke');
-        equal(options.hash.bool, true);
-        return 'Helper called';
-      }
-    };
-
-    var result = template({}, { helpers: helpers });
-    equal(result, 'Helper called');
-  });
-
-  it('hash parameters get context information', function() {
-    var template = CompilerContext.compile("{{#with dale}}{{tomdale he.says desire='need' noun=../dad/joke bool=true}}{{/with}}", { stringParams: true });
-
-    var context = {dale: {}};
-
-    var helpers = {
-      tomdale: function(exclamation, options) {
-        equal(exclamation, 'he.says');
-        equal(options.types[0], 'PathExpression');
-
-        equal(options.contexts.length, 1);
-        equal(options.hashContexts.noun, context);
-        equal(options.hash.desire, 'need');
-        equal(options.hash.noun, 'dad.joke');
-        equal(options.hash.bool, true);
-        return 'Helper called';
-      },
-      'with': function(withContext, options) {
-        return options.fn(options.contexts[0][withContext]);
-      }
-    };
-
-    var result = template(context, { helpers: helpers });
-    equal(result, 'Helper called');
-  });
-
-  it('when inside a block in String mode, .. passes the appropriate context in the options hash to a block helper', function() {
-    var template = CompilerContext.compile('{{#with dale}}{{#tomdale ../need dad.joke}}wot{{/tomdale}}{{/with}}', {stringParams: true});
-
-    var helpers = {
-      tomdale: function(desire, noun, options) {
-        return 'STOP ME FROM READING HACKER NEWS I ' +
-                options.contexts[0][desire] + ' ' + noun + ' ' +
-                options.fn(this);
-      },
-
-      'with': function(context, options) {
-        return options.fn(options.contexts[0][context]);
-      }
-    };
-
-    var result = template({
-      dale: {},
-
-      need: 'need-a'
-    }, {helpers: helpers});
-
-    equals(result, 'STOP ME FROM READING HACKER NEWS I need-a dad.joke wot', 'Proper context variable output');
-  });
-
-  it('with nested block ambiguous', function() {
-    var template = CompilerContext.compile('{{#with content}}{{#view}}{{firstName}} {{lastName}}{{/view}}{{/with}}', {stringParams: true});
-
-    var helpers = {
-      'with': function() {
-        return 'WITH';
-      },
-      view: function() {
-        return 'VIEW';
-      }
-    };
-
-    var result = template({}, {helpers: helpers});
-    equals(result, 'WITH');
-  });
-
-  it('should handle DATA', function() {
-    var template = CompilerContext.compile('{{foo @bar}}', { stringParams: true });
-
-    var helpers = {
-      foo: function(bar, options) {
-        equal(bar, '@bar');
-        equal(options.types[0], 'PathExpression');
-        return 'Foo!';
-      }
-    };
-
-    var result = template({}, { helpers: helpers });
-    equal(result, 'Foo!');
-  });
-});
diff --git a/lib/handlebars/spec/subexpressions.js b/lib/handlebars/spec/subexpressions.js
deleted file mode 100644
index dad741e4a..000000000
--- a/lib/handlebars/spec/subexpressions.js
+++ /dev/null
@@ -1,238 +0,0 @@
-describe('subexpressions', function() {
-  it('arg-less helper', function() {
-    var string = '{{foo (bar)}}!';
-    var context = {};
-    var helpers = {
-      foo: function(val) {
-        return val + val;
-      },
-      bar: function() {
-        return 'LOL';
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'LOLLOL!');
-  });
-
-  it('helper w args', function() {
-    var string = '{{blog (equal a b)}}';
-
-    var context = { bar: 'LOL' };
-    var helpers = {
-      blog: function(val) {
-        return 'val is ' + val;
-      },
-      equal: function(x, y) {
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'val is true');
-  });
-
-  it('mixed paths and helpers', function() {
-    var string = '{{blog baz.bat (equal a b) baz.bar}}';
-
-    var context = { bar: 'LOL', baz: {bat: 'foo!', bar: 'bar!'} };
-    var helpers = {
-      blog: function(val, that, theOther) {
-        return 'val is ' + val + ', ' + that + ' and ' + theOther;
-      },
-      equal: function(x, y) {
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'val is foo!, true and bar!');
-  });
-
-  it('supports much nesting', function() {
-    var string = '{{blog (equal (equal true true) true)}}';
-
-    var context = { bar: 'LOL' };
-    var helpers = {
-      blog: function(val) {
-        return 'val is ' + val;
-      },
-      equal: function(x, y) {
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'val is true');
-  });
-
-  it('GH-800 : Complex subexpressions', function() {
-    var context = {a: 'a', b: 'b', c: {c: 'c'}, d: 'd', e: {e: 'e'}};
-    var helpers = {
-      dash: function(a, b) {
-        return a + '-' + b;
-      },
-      concat: function(a, b) {
-        return a + b;
-      }
-    };
-
-    shouldCompileTo("{{dash 'abc' (concat a b)}}", [context, helpers], 'abc-ab');
-    shouldCompileTo('{{dash d (concat a b)}}', [context, helpers], 'd-ab');
-    shouldCompileTo('{{dash c.c (concat a b)}}', [context, helpers], 'c-ab');
-    shouldCompileTo('{{dash (concat a b) c.c}}', [context, helpers], 'ab-c');
-    shouldCompileTo('{{dash (concat a e.e) c.c}}', [context, helpers], 'ae-c');
-  });
-
-  it('provides each nested helper invocation its own options hash', function() {
-    var string = '{{equal (equal true true) true}}';
-
-    var lastOptions = null;
-    var helpers = {
-      equal: function(x, y, options) {
-        if (!options || options === lastOptions) {
-          throw new Error('options hash was reused');
-        }
-        lastOptions = options;
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [{}, helpers], 'true');
-  });
-
-  it('with hashes', function() {
-    var string = "{{blog (equal (equal true true) true fun='yes')}}";
-
-    var context = { bar: 'LOL' };
-    var helpers = {
-      blog: function(val) {
-        return 'val is ' + val;
-      },
-      equal: function(x, y) {
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'val is true');
-  });
-
-  it('as hashes', function() {
-    var string = "{{blog fun=(equal (blog fun=1) 'val is 1')}}";
-
-    var helpers = {
-      blog: function(options) {
-        return 'val is ' + options.hash.fun;
-      },
-      equal: function(x, y) {
-        return x === y;
-      }
-    };
-    shouldCompileTo(string, [{}, helpers], 'val is true');
-  });
-
-  it('multiple subexpressions in a hash', function() {
-    var string = '{{input aria-label=(t "Name") placeholder=(t "Example User")}}';
-
-    var helpers = {
-      input: function(options) {
-        var hash = options.hash;
-        var ariaLabel = Handlebars.Utils.escapeExpression(hash['aria-label']);
-        var placeholder = Handlebars.Utils.escapeExpression(hash.placeholder);
-        return new Handlebars.SafeString('<input aria-label="' + ariaLabel + '" placeholder="' + placeholder + '" />');
-      },
-      t: function(defaultString) {
-        return new Handlebars.SafeString(defaultString);
-      }
-    };
-    shouldCompileTo(string, [{}, helpers], '<input aria-label="Name" placeholder="Example User" />');
-  });
-
-  it('multiple subexpressions in a hash with context', function() {
-    var string = '{{input aria-label=(t item.field) placeholder=(t item.placeholder)}}';
-
-    var context = {
-      item: {
-        field: 'Name',
-        placeholder: 'Example User'
-      }
-    };
-
-    var helpers = {
-      input: function(options) {
-        var hash = options.hash;
-        var ariaLabel = Handlebars.Utils.escapeExpression(hash['aria-label']);
-        var placeholder = Handlebars.Utils.escapeExpression(hash.placeholder);
-        return new Handlebars.SafeString('<input aria-label="' + ariaLabel + '" placeholder="' + placeholder + '" />');
-      },
-      t: function(defaultString) {
-        return new Handlebars.SafeString(defaultString);
-      }
-    };
-    shouldCompileTo(string, [context, helpers], '<input aria-label="Name" placeholder="Example User" />');
-  });
-
-  it('in string params mode,', function() {
-    var template = CompilerContext.compile('{{snog (blorg foo x=y) yeah a=b}}', {stringParams: true});
-
-    var helpers = {
-      snog: function(a, b, options) {
-        equals(a, 'foo');
-        equals(options.types.length, 2, 'string params for outer helper processed correctly');
-        equals(options.types[0], 'SubExpression', 'string params for outer helper processed correctly');
-        equals(options.types[1], 'PathExpression', 'string params for outer helper processed correctly');
-        return a + b;
-      },
-
-      blorg: function(a, options) {
-        equals(options.types.length, 1, 'string params for inner helper processed correctly');
-        equals(options.types[0], 'PathExpression', 'string params for inner helper processed correctly');
-        return a;
-      }
-    };
-
-    var result = template({
-      foo: {},
-      yeah: {}
-    }, {helpers: helpers});
-
-    equals(result, 'fooyeah');
-  });
-
-  it('as hashes in string params mode', function() {
-    var template = CompilerContext.compile('{{blog fun=(bork)}}', {stringParams: true});
-
-    var helpers = {
-      blog: function(options) {
-        equals(options.hashTypes.fun, 'SubExpression');
-        return 'val is ' + options.hash.fun;
-      },
-      bork: function() {
-        return 'BORK';
-      }
-    };
-
-    var result = template({}, {helpers: helpers});
-    equals(result, 'val is BORK');
-  });
-
-  it('subexpression functions on the context', function() {
-    var string = '{{foo (bar)}}!';
-    var context = {
-      bar: function() {
-        return 'LOL';
-      }
-    };
-    var helpers = {
-      foo: function(val) {
-        return val + val;
-      }
-    };
-    shouldCompileTo(string, [context, helpers], 'LOLLOL!');
-  });
-
-  it("subexpressions can't just be property lookups", function() {
-    var string = '{{foo (bar)}}!';
-    var context = {
-      bar: 'LOL'
-    };
-    var helpers = {
-      foo: function(val) {
-        return val + val;
-      }
-    };
-    shouldThrow(function() {
-      shouldCompileTo(string, [context, helpers], 'LOLLOL!');
-    });
-  });
-});
diff --git a/lib/handlebars/spec/tokenizer.js b/lib/handlebars/spec/tokenizer.js
deleted file mode 100644
index ad71dc9b2..000000000
--- a/lib/handlebars/spec/tokenizer.js
+++ /dev/null
@@ -1,426 +0,0 @@
-function shouldMatchTokens(result, tokens) {
-  for (var index = 0; index < result.length; index++) {
-    equals(result[index].name, tokens[index]);
-  }
-}
-function shouldBeToken(result, name, text) {
-  equals(result.name, name);
-  equals(result.text, text);
-}
-
-describe('Tokenizer', function() {
-  if (!Handlebars.Parser) {
-    return;
-  }
-
-  function tokenize(template) {
-    var parser = Handlebars.Parser,
-        lexer = parser.lexer;
-
-    lexer.setInput(template);
-    var out = [],
-        token;
-
-    while ((token = lexer.lex())) {
-      var result = parser.terminals_[token] || token;
-      if (!result || result === 'EOF' || result === 'INVALID') {
-        break;
-      }
-      out.push({name: result, text: lexer.yytext});
-    }
-
-    return out;
-  }
-
-  it('tokenizes a simple mustache as "OPEN ID CLOSE"', function() {
-    var result = tokenize('{{foo}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-  });
-
-  it('supports unescaping with &', function() {
-    var result = tokenize('{{&bar}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[0], 'OPEN', '{{&');
-    shouldBeToken(result[1], 'ID', 'bar');
-  });
-
-  it('supports unescaping with {{{', function() {
-    var result = tokenize('{{{bar}}}');
-    shouldMatchTokens(result, ['OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED']);
-
-    shouldBeToken(result[1], 'ID', 'bar');
-  });
-
-  it('supports escaping delimiters', function() {
-    var result = tokenize('{{foo}} \\{{bar}} {{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[3], 'CONTENT', ' ');
-    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
-  });
-
-  it('supports escaping multiple delimiters', function() {
-    var result = tokenize('{{foo}} \\{{bar}} \\{{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']);
-
-    shouldBeToken(result[3], 'CONTENT', ' ');
-    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
-    shouldBeToken(result[5], 'CONTENT', '{{baz}}');
-  });
-
-  it('supports escaping a triple stash', function() {
-    var result = tokenize('{{foo}} \\{{{bar}}} {{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[4], 'CONTENT', '{{{bar}}} ');
-  });
-
-  it('supports escaping escape character', function() {
-    var result = tokenize('{{foo}} \\\\{{bar}} {{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[3], 'CONTENT', ' \\');
-    shouldBeToken(result[5], 'ID', 'bar');
-  });
-
-  it('supports escaping multiple escape characters', function() {
-    var result = tokenize('{{foo}} \\\\{{bar}} \\\\{{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[3], 'CONTENT', ' \\');
-    shouldBeToken(result[5], 'ID', 'bar');
-    shouldBeToken(result[7], 'CONTENT', ' \\');
-    shouldBeToken(result[9], 'ID', 'baz');
-  });
-
-  it('supports escaped mustaches after escaped escape characters', function() {
-    var result = tokenize('{{foo}} \\\\{{bar}} \\{{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']);
-
-    shouldBeToken(result[3], 'CONTENT', ' \\');
-    shouldBeToken(result[4], 'OPEN', '{{');
-    shouldBeToken(result[5], 'ID', 'bar');
-    shouldBeToken(result[7], 'CONTENT', ' ');
-    shouldBeToken(result[8], 'CONTENT', '{{baz}}');
-  });
-
-  it('supports escaped escape characters after escaped mustaches', function() {
-    var result = tokenize('{{foo}} \\{{bar}} \\\\{{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[4], 'CONTENT', '{{bar}} ');
-    shouldBeToken(result[5], 'CONTENT', '\\');
-    shouldBeToken(result[6], 'OPEN', '{{');
-    shouldBeToken(result[7], 'ID', 'baz');
-  });
-
-  it('supports escaped escape character on a triple stash', function() {
-    var result = tokenize('{{foo}} \\\\{{{bar}}} {{baz}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-
-    shouldBeToken(result[3], 'CONTENT', ' \\');
-    shouldBeToken(result[5], 'ID', 'bar');
-  });
-
-  it('tokenizes a simple path', function() {
-    var result = tokenize('{{foo/bar}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-  });
-
-  it('allows dot notation', function() {
-    var result = tokenize('{{foo.bar}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-
-    shouldMatchTokens(tokenize('{{foo.bar.baz}}'), ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-  });
-
-  it('allows path literals with []', function() {
-    var result = tokenize('{{foo.[bar]}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-  });
-
-  it('allows multiple path literals on a line with []', function() {
-    var result = tokenize('{{foo.[bar]}}{{foo.[baz]}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE', 'OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes {{.}} as OPEN ID CLOSE', function() {
-    var result = tokenize('{{.}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a path as "OPEN (ID SEP)* ID CLOSE"', function() {
-    var result = tokenize('{{../foo/bar}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', '..');
-  });
-
-  it('tokenizes a path with .. as a parent path', function() {
-    var result = tokenize('{{../foo.bar}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', '..');
-  });
-
-  it('tokenizes a path with this/foo as OPEN ID SEP ID CLOSE', function() {
-    var result = tokenize('{{this/foo}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'SEP', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'this');
-    shouldBeToken(result[3], 'ID', 'foo');
-  });
-
-  it('tokenizes a simple mustache with spaces as "OPEN ID CLOSE"', function() {
-    var result = tokenize('{{  foo  }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-  });
-
-  it('tokenizes a simple mustache with line breaks as "OPEN ID ID CLOSE"', function() {
-    var result = tokenize('{{  foo  \n   bar }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-  });
-
-  it('tokenizes raw content as "CONTENT"', function() {
-    var result = tokenize('foo {{ bar }} baz');
-    shouldMatchTokens(result, ['CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT']);
-    shouldBeToken(result[0], 'CONTENT', 'foo ');
-    shouldBeToken(result[4], 'CONTENT', ' baz');
-  });
-
-  it('tokenizes a partial as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize('{{> foo}}');
-    shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a partial with context as "OPEN_PARTIAL ID ID CLOSE"', function() {
-    var result = tokenize('{{> foo bar }}');
-    shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a partial without spaces as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize('{{>foo}}');
-    shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a partial space at the }); as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize('{{>foo  }}');
-    shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a partial space at the }); as "OPEN_PARTIAL ID CLOSE"', function() {
-    var result = tokenize('{{>foo/bar.baz  }}');
-    shouldMatchTokens(result, ['OPEN_PARTIAL', 'ID', 'SEP', 'ID', 'SEP', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes a comment as "COMMENT"', function() {
-    var result = tokenize('foo {{! this is a comment }} bar {{ baz }}');
-    shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'COMMENT', '{{! this is a comment }}');
-  });
-
-  it('tokenizes a block comment as "COMMENT"', function() {
-    var result = tokenize('foo {{!-- this is a {{comment}} --}} bar {{ baz }}');
-    shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'COMMENT', '{{!-- this is a {{comment}} --}}');
-  });
-
-  it('tokenizes a block comment with whitespace as "COMMENT"', function() {
-    var result = tokenize('foo {{!-- this is a\n{{comment}}\n--}} bar {{ baz }}');
-    shouldMatchTokens(result, ['CONTENT', 'COMMENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'COMMENT', '{{!-- this is a\n{{comment}}\n--}}');
-  });
-
-  it('tokenizes open and closing blocks as OPEN_BLOCK, ID, CLOSE ..., OPEN_ENDBLOCK ID CLOSE', function() {
-    var result = tokenize('{{#foo}}content{{/foo}}');
-    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'CLOSE', 'CONTENT', 'OPEN_ENDBLOCK', 'ID', 'CLOSE']);
-  });
-
-  it('tokenizes inverse sections as "INVERSE"', function() {
-    shouldMatchTokens(tokenize('{{^}}'), ['INVERSE']);
-    shouldMatchTokens(tokenize('{{else}}'), ['INVERSE']);
-    shouldMatchTokens(tokenize('{{ else }}'), ['INVERSE']);
-  });
-
-  it('tokenizes inverse sections with ID as "OPEN_INVERSE ID CLOSE"', function() {
-    var result = tokenize('{{^foo}}');
-    shouldMatchTokens(result, ['OPEN_INVERSE', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-  });
-
-  it('tokenizes inverse sections with ID and spaces as "OPEN_INVERSE ID CLOSE"', function() {
-    var result = tokenize('{{^ foo  }}');
-    shouldMatchTokens(result, ['OPEN_INVERSE', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-  });
-
-  it('tokenizes mustaches with params as "OPEN ID ID ID CLOSE"', function() {
-    var result = tokenize('{{ foo bar baz }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-    shouldBeToken(result[2], 'ID', 'bar');
-    shouldBeToken(result[3], 'ID', 'baz');
-  });
-
-  it('tokenizes mustaches with String params as "OPEN ID ID STRING CLOSE"', function() {
-    var result = tokenize('{{ foo bar \'baz\' }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], 'STRING', 'baz');
-  });
-
-  it('tokenizes mustaches with String params using single quotes as "OPEN ID ID STRING CLOSE"', function() {
-    var result = tokenize("{{ foo bar \'baz\' }}");
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], 'STRING', 'baz');
-  });
-
-  it('tokenizes String params with spaces inside as "STRING"', function() {
-    var result = tokenize('{{ foo bar "baz bat" }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[3], 'STRING', 'baz bat');
-  });
-
-  it('tokenizes String params with escapes quotes as STRING', function() {
-    var result = tokenize('{{ foo "bar\\"baz" }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], 'STRING', 'bar"baz');
-  });
-
-  it('tokenizes String params using single quotes with escapes quotes as STRING', function() {
-    var result = tokenize("{{ foo 'bar\\'baz' }}");
-    shouldMatchTokens(result, ['OPEN', 'ID', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], 'STRING', "bar'baz");
-  });
-
-  it('tokenizes numbers', function() {
-    var result = tokenize('{{ foo 1 }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], 'NUMBER', '1');
-
-    result = tokenize('{{ foo 1.1 }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], 'NUMBER', '1.1');
-
-    result = tokenize('{{ foo -1 }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], 'NUMBER', '-1');
-
-    result = tokenize('{{ foo -1.1 }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'NUMBER', 'CLOSE']);
-    shouldBeToken(result[2], 'NUMBER', '-1.1');
-  });
-
-  it('tokenizes booleans', function() {
-    var result = tokenize('{{ foo true }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'BOOLEAN', 'CLOSE']);
-    shouldBeToken(result[2], 'BOOLEAN', 'true');
-
-    result = tokenize('{{ foo false }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'BOOLEAN', 'CLOSE']);
-    shouldBeToken(result[2], 'BOOLEAN', 'false');
-  });
-
-  it('tokenizes undefined and null', function() {
-    var result = tokenize('{{ foo undefined null }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'UNDEFINED', 'NULL', 'CLOSE']);
-    shouldBeToken(result[2], 'UNDEFINED', 'undefined');
-    shouldBeToken(result[3], 'NULL', 'null');
-  });
-
-  it('tokenizes hash arguments', function() {
-    var result = tokenize('{{ foo bar=baz }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=bat }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=1 }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'NUMBER', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=true }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'BOOLEAN', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=false }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'BOOLEAN', 'CLOSE']);
-
-    result = tokenize('{{ foo bar\n  baz=bat }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=\"bat\" }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'STRING', 'CLOSE']);
-
-    result = tokenize('{{ foo bar baz=\"bat\" bam=wot }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'STRING', 'ID', 'EQUALS', 'ID', 'CLOSE']);
-
-    result = tokenize('{{foo omg bar=baz bat=\"bam\"}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'ID', 'EQUALS', 'ID', 'ID', 'EQUALS', 'STRING', 'CLOSE']);
-    shouldBeToken(result[2], 'ID', 'omg');
-  });
-
-  it('tokenizes special @ identifiers', function() {
-    var result = tokenize('{{ @foo }}');
-    shouldMatchTokens(result, ['OPEN', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[2], 'ID', 'foo');
-
-    result = tokenize('{{ foo @bar }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[3], 'ID', 'bar');
-
-    result = tokenize('{{ foo bar=@baz }}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'ID', 'EQUALS', 'DATA', 'ID', 'CLOSE']);
-    shouldBeToken(result[5], 'ID', 'baz');
-  });
-
-  it('does not time out in a mustache with a single } followed by EOF', function() {
-    shouldMatchTokens(tokenize('{{foo}'), ['OPEN', 'ID']);
-  });
-
-  it('does not time out in a mustache when invalid ID characters are used', function() {
-    shouldMatchTokens(tokenize('{{foo & }}'), ['OPEN', 'ID']);
-  });
-
-  it('tokenizes subexpressions', function() {
-    var result = tokenize('{{foo (bar)}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-    shouldBeToken(result[3], 'ID', 'bar');
-
-    result = tokenize('{{foo (a-x b-y)}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[1], 'ID', 'foo');
-    shouldBeToken(result[3], 'ID', 'a-x');
-    shouldBeToken(result[4], 'ID', 'b-y');
-  });
-
-  it('tokenizes nested subexpressions', function() {
-    var result = tokenize('{{foo (bar (lol rofl)) (baz)}}');
-    shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'OPEN_SEXPR', 'ID', 'ID', 'CLOSE_SEXPR', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'CLOSE_SEXPR', 'CLOSE']);
-    shouldBeToken(result[3], 'ID', 'bar');
-    shouldBeToken(result[5], 'ID', 'lol');
-    shouldBeToken(result[6], 'ID', 'rofl');
-    shouldBeToken(result[10], 'ID', 'baz');
-  });
-
-  it('tokenizes nested subexpressions: literals', function() {
-    var result = tokenize("{{foo (bar (lol true) false) (baz 1) (blah 'b') (blorg \"c\")}}");
-    shouldMatchTokens(result, ['OPEN', 'ID', 'OPEN_SEXPR', 'ID', 'OPEN_SEXPR', 'ID', 'BOOLEAN', 'CLOSE_SEXPR', 'BOOLEAN', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'NUMBER', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'STRING', 'CLOSE_SEXPR', 'OPEN_SEXPR', 'ID', 'STRING', 'CLOSE_SEXPR', 'CLOSE']);
-  });
-
-  it('tokenizes block params', function() {
-    var result = tokenize('{{#foo as |bar|}}');
-    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
-
-    result = tokenize('{{#foo as |bar baz|}}');
-    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
-
-    result = tokenize('{{#foo as | bar baz |}}');
-    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
-
-    result = tokenize('{{#foo as as | bar baz |}}');
-    shouldMatchTokens(result, ['OPEN_BLOCK', 'ID', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
-
-    result = tokenize('{{else foo as |bar baz|}}');
-    shouldMatchTokens(result, ['OPEN_INVERSE_CHAIN', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
-  });
-});
diff --git a/lib/handlebars/spec/track-ids.js b/lib/handlebars/spec/track-ids.js
deleted file mode 100644
index 7a8b59ee4..000000000
--- a/lib/handlebars/spec/track-ids.js
+++ /dev/null
@@ -1,191 +0,0 @@
-describe('track ids', function() {
-  var context;
-  beforeEach(function() {
-    context = {is: {a: 'foo'}, slave: {driver: 'bar'}};
-  });
-
-  it('should not include anything without the flag', function() {
-    var template = CompilerContext.compile('{{wycats is.a slave.driver}}');
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        equal(options.ids, undefined);
-        equal(options.hashIds, undefined);
-
-        return 'success';
-      }
-    };
-
-    equals(template({}, {helpers: helpers}), 'success');
-  });
-  it('should include argument ids', function() {
-    var template = CompilerContext.compile('{{wycats is.a slave.driver}}', {trackIds: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        equal(options.ids[0], 'is.a');
-        equal(options.ids[1], 'slave.driver');
-
-        return 'HELP ME MY BOSS ' + options.ids[0] + ':' + passiveVoice + ' ' + options.ids[1] + ':' + noun;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS is.a:foo slave.driver:bar');
-  });
-  it('should include hash ids', function() {
-    var template = CompilerContext.compile('{{wycats bat=is.a baz=slave.driver}}', {trackIds: true});
-
-    var helpers = {
-      wycats: function(options) {
-        equal(options.hashIds.bat, 'is.a');
-        equal(options.hashIds.baz, 'slave.driver');
-
-        return 'HELP ME MY BOSS ' + options.hashIds.bat + ':' + options.hash.bat + ' ' + options.hashIds.baz + ':' + options.hash.baz;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS is.a:foo slave.driver:bar');
-  });
-  it('should note ../ and ./ references', function() {
-    var template = CompilerContext.compile('{{wycats ./is.a ../slave.driver}}', {trackIds: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        equal(options.ids[0], 'is.a');
-        equal(options.ids[1], '../slave.driver');
-
-        return 'HELP ME MY BOSS ' + options.ids[0] + ':' + passiveVoice + ' ' + options.ids[1] + ':' + noun;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS is.a:foo ../slave.driver:undefined');
-  });
-  it('should note @data references', function() {
-    var template = CompilerContext.compile('{{wycats @is.a @slave.driver}}', {trackIds: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        equal(options.ids[0], '@is.a');
-        equal(options.ids[1], '@slave.driver');
-
-        return 'HELP ME MY BOSS ' + options.ids[0] + ':' + passiveVoice + ' ' + options.ids[1] + ':' + noun;
-      }
-    };
-
-    equals(template({}, {helpers: helpers, data: context}), 'HELP ME MY BOSS @is.a:foo @slave.driver:bar');
-  });
-
-  it('should return null for constants', function() {
-    var template = CompilerContext.compile('{{wycats 1 "foo" key=false}}', {trackIds: true});
-
-    var helpers = {
-      wycats: function(passiveVoice, noun, options) {
-        equal(options.ids[0], null);
-        equal(options.ids[1], null);
-        equal(options.hashIds.key, null);
-
-        return 'HELP ME MY BOSS ' + passiveVoice + ' ' + noun + ' ' + options.hash.key;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS 1 foo false');
-  });
-  it('should return true for subexpressions', function() {
-    var template = CompilerContext.compile('{{wycats (sub)}}', {trackIds: true});
-
-    var helpers = {
-      sub: function() { return 1; },
-      wycats: function(passiveVoice, options) {
-        equal(options.ids[0], true);
-
-        return 'HELP ME MY BOSS ' + passiveVoice;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS 1');
-  });
-
-  it('should use block param paths', function() {
-    var template = CompilerContext.compile('{{#doIt as |is|}}{{wycats is.a slave.driver is}}{{/doIt}}', {trackIds: true});
-
-    var helpers = {
-      doIt: function(options) {
-        var blockParams = [this.is];
-        blockParams.path = ['zomg'];
-        return options.fn(this, {blockParams: blockParams});
-      },
-      wycats: function(passiveVoice, noun, blah, options) {
-        equal(options.ids[0], 'zomg.a');
-        equal(options.ids[1], 'slave.driver');
-        equal(options.ids[2], 'zomg');
-
-        return 'HELP ME MY BOSS ' + options.ids[0] + ':' + passiveVoice + ' ' + options.ids[1] + ':' + noun;
-      }
-    };
-
-    equals(template(context, {helpers: helpers}), 'HELP ME MY BOSS zomg.a:foo slave.driver:bar');
-  });
-
-  describe('builtin helpers', function() {
-    var helpers = {
-      blockParams: function(name, options) {
-        return name + ':' + options.ids[0] + '\n';
-      },
-      wycats: function(name, options) {
-        return name + ':' + options.data.contextPath + '\n';
-      }
-    };
-
-    describe('#each', function() {
-      it('should track contextPath for arrays', function() {
-        var template = CompilerContext.compile('{{#each array}}{{wycats name}}{{/each}}', {trackIds: true});
-
-        equals(template({array: [{name: 'foo'}, {name: 'bar'}]}, {helpers: helpers}), 'foo:array.0\nbar:array.1\n');
-      });
-      it('should track contextPath for keys', function() {
-        var template = CompilerContext.compile('{{#each object}}{{wycats name}}{{/each}}', {trackIds: true});
-
-        equals(template({object: {foo: {name: 'foo'}, bar: {name: 'bar'}}}, {helpers: helpers}), 'foo:object.foo\nbar:object.bar\n');
-      });
-      it('should handle nesting', function() {
-        var template = CompilerContext.compile('{{#each .}}{{#each .}}{{wycats name}}{{/each}}{{/each}}', {trackIds: true});
-
-        equals(template({array: [{name: 'foo'}, {name: 'bar'}]}, {helpers: helpers}), 'foo:.array..0\nbar:.array..1\n');
-      });
-      it('should handle block params', function() {
-        var template = CompilerContext.compile('{{#each array as |value|}}{{blockParams value.name}}{{/each}}', {trackIds: true});
-
-        equals(template({array: [{name: 'foo'}, {name: 'bar'}]}, {helpers: helpers}), 'foo:array.0.name\nbar:array.1.name\n');
-      });
-    });
-    describe('#with', function() {
-      it('should track contextPath', function() {
-        var template = CompilerContext.compile('{{#with field}}{{wycats name}}{{/with}}', {trackIds: true});
-
-        equals(template({field: {name: 'foo'}}, {helpers: helpers}), 'foo:field\n');
-      });
-      it('should handle nesting', function() {
-        var template = CompilerContext.compile('{{#with bat}}{{#with field}}{{wycats name}}{{/with}}{{/with}}', {trackIds: true});
-
-        equals(template({bat: {field: {name: 'foo'}}}, {helpers: helpers}), 'foo:bat.field\n');
-      });
-    });
-    describe('#blockHelperMissing', function() {
-      it('should track contextPath for arrays', function() {
-        var template = CompilerContext.compile('{{#field}}{{wycats name}}{{/field}}', {trackIds: true});
-
-        equals(template({field: [{name: 'foo'}]}, {helpers: helpers}), 'foo:field.0\n');
-      });
-      it('should track contextPath for keys', function() {
-        var template = CompilerContext.compile('{{#field}}{{wycats name}}{{/field}}', {trackIds: true});
-
-        equals(template({field: {name: 'foo'}}, {helpers: helpers}), 'foo:field\n');
-      });
-      it('should handle nesting', function() {
-        var template = CompilerContext.compile('{{#bat}}{{#field}}{{wycats name}}{{/field}}{{/bat}}', {trackIds: true});
-
-        equals(template({bat: {field: {name: 'foo'}}}, {helpers: helpers}), 'foo:bat.field\n');
-      });
-    });
-  });
-});
diff --git a/lib/handlebars/spec/umd-runtime.html b/lib/handlebars/spec/umd-runtime.html
deleted file mode 100644
index 90b91448a..000000000
--- a/lib/handlebars/spec/umd-runtime.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-  <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      mocha.setup('bdd');
-    </script>
-
-    <script src="/spec/env/json2.js"></script>
-    <script src="/spec/env/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
-    <script>
-      requirejs.config({
-        paths: {
-          'handlebars.runtime': '/dist/handlebars.runtime'
-        }
-      });
-    </script>
-    <script>
-      onload = function(){
-        require(['handlebars.runtime'], function(Handlebars) {
-          describe('runtime', function() {
-            it('should load', function() {
-              equal(!!Handlebars.template, true);
-              equal(!!Handlebars.VERSION, true);
-            });
-          });
-
-          mocha.globals(['mochaResults'])
-          // The test harness leaks under FF. We should have decent global leak coverage from other tests
-          if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-            mocha.checkLeaks();
-          }
-          var runner = mocha.run();
-
-          //Reporting for saucelabs
-          var failedTests = [];
-          runner.on('end', function(){
-            window.mochaResults = runner.stats;
-            window.mochaResults.reports = failedTests;
-          });
-
-          runner.on('fail', logFailure);
-
-          function logFailure(test, err){
-
-            var flattenTitles = function(test){
-              var titles = [];
-              while (test.parent.title){
-                titles.push(test.parent.title);
-                test = test.parent;
-              }
-              return titles.reverse();
-            };
-
-            failedTests.push({
-              name: test.title,
-              result: false,
-              message: err.message,
-              stack: err.stack,
-              titles: flattenTitles(test)
-            });
-          }
-        });
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-  </body>
-</html>
diff --git a/lib/handlebars/spec/umd.html b/lib/handlebars/spec/umd.html
deleted file mode 100644
index 5f3863fc8..000000000
--- a/lib/handlebars/spec/umd.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-  <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      mocha.setup('bdd');
-    </script>
-
-    <script src="/spec/env/json2.js"></script>
-    <script src="/spec/env/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
-    <script>
-      requirejs.config({
-        paths: {
-          handlebars: '/dist/handlebars',
-          tests: '/tmp/tests'
-        }
-      });
-
-      var CompilerContext = {
-        compile: function(template, options) {
-          var templateSpec = handlebarsEnv.precompile(template, options);
-          return handlebarsEnv.template(safeEval(templateSpec));
-        },
-        compileWithPartial: function(template, options) {
-          return handlebarsEnv.compile(template, options);
-        }
-      };
-
-      function safeEval(templateSpec) {
-        try {
-          var ret;
-          eval('ret = ' + templateSpec);
-          return ret;
-        } catch (err) {
-          console.error(templateSpec);
-          throw err;
-        }
-      }
-    </script>
-    <script>
-      onload = function(){
-
-        require(['handlebars'], function(Handlebars) {
-          window.Handlebars = Handlebars;
-
-          require(['tests'], function() {
-            mocha.globals(['mochaResults'])
-            // The test harness leaks under FF. We should have decent global leak coverage from other tests
-            if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-              mocha.checkLeaks();
-            }
-            var runner = mocha.run();
-
-            //Reporting for saucelabs
-            var failedTests = [];
-            runner.on('end', function(){
-              window.mochaResults = runner.stats;
-              window.mochaResults.reports = failedTests;
-            });
-
-            runner.on('fail', logFailure);
-
-            function logFailure(test, err){
-
-              var flattenTitles = function(test){
-                var titles = [];
-                while (test.parent.title){
-                  titles.push(test.parent.title);
-                  test = test.parent;
-                }
-                return titles.reverse();
-              };
-
-              failedTests.push({
-                name: test.title,
-                result: false,
-                message: err.message,
-                stack: err.stack,
-                titles: flattenTitles(test)
-              });
-            };
-          });
-        });
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
-  </body>
-</html>
diff --git a/lib/handlebars/spec/utils.js b/lib/handlebars/spec/utils.js
deleted file mode 100644
index 81732c5e7..000000000
--- a/lib/handlebars/spec/utils.js
+++ /dev/null
@@ -1,79 +0,0 @@
-describe('utils', function() {
-  describe('#SafeString', function() {
-    it('constructing a safestring from a string and checking its type', function() {
-      var safe = new Handlebars.SafeString('testing 1, 2, 3');
-      if (!(safe instanceof Handlebars.SafeString)) {
-        throw new Error('Must be instance of SafeString');
-      }
-      equals(safe.toString(), 'testing 1, 2, 3', 'SafeString is equivalent to its underlying string');
-    });
-
-    it('it should not escape SafeString properties', function() {
-      var name = new Handlebars.SafeString('<em>Sean O&#x27;Malley</em>');
-
-      shouldCompileTo('{{name}}', [{name: name}], '<em>Sean O&#x27;Malley</em>');
-    });
-  });
-
-  describe('#escapeExpression', function() {
-    it('shouhld escape html', function() {
-      equals(Handlebars.Utils.escapeExpression('foo<&"\'>'), 'foo&lt;&amp;&quot;&#x27;&gt;');
-    });
-    it('should not escape SafeString', function() {
-      var string = new Handlebars.SafeString('foo<&"\'>');
-      equals(Handlebars.Utils.escapeExpression(string), 'foo<&"\'>');
-
-      var obj = {
-        toHTML: function() {
-          return 'foo<&"\'>';
-        }
-      };
-      equals(Handlebars.Utils.escapeExpression(obj), 'foo<&"\'>');
-    });
-    it('should handle falsy', function() {
-      equals(Handlebars.Utils.escapeExpression(''), '');
-      equals(Handlebars.Utils.escapeExpression(undefined), '');
-      equals(Handlebars.Utils.escapeExpression(null), '');
-
-      equals(Handlebars.Utils.escapeExpression(false), 'false');
-      equals(Handlebars.Utils.escapeExpression(0), '0');
-    });
-    it('should handle empty objects', function() {
-      equals(Handlebars.Utils.escapeExpression({}), {}.toString());
-      equals(Handlebars.Utils.escapeExpression([]), [].toString());
-    });
-  });
-
-  describe('#isEmpty', function() {
-    it('should not be empty', function() {
-      equals(Handlebars.Utils.isEmpty(undefined), true);
-      equals(Handlebars.Utils.isEmpty(null), true);
-      equals(Handlebars.Utils.isEmpty(false), true);
-      equals(Handlebars.Utils.isEmpty(''), true);
-      equals(Handlebars.Utils.isEmpty([]), true);
-    });
-
-    it('should be empty', function() {
-      equals(Handlebars.Utils.isEmpty(0), false);
-      equals(Handlebars.Utils.isEmpty([1]), false);
-      equals(Handlebars.Utils.isEmpty('foo'), false);
-      equals(Handlebars.Utils.isEmpty({bar: 1}), false);
-    });
-  });
-
-  describe('#extend', function() {
-    it('should ignore prototype values', function() {
-      function A() {
-        this.a = 1;
-      }
-      A.prototype.b = 4;
-
-      var b = {b: 2};
-
-      Handlebars.Utils.extend(b, new A());
-
-      equals(b.a, 1);
-      equals(b.b, 2);
-    });
-  });
-});
diff --git a/lib/handlebars/spec/visitor.js b/lib/handlebars/spec/visitor.js
deleted file mode 100644
index 1f50d79c1..000000000
--- a/lib/handlebars/spec/visitor.js
+++ /dev/null
@@ -1,141 +0,0 @@
-describe('Visitor', function() {
-  if (!Handlebars.Visitor || !Handlebars.print) {
-    return;
-  }
-
-  it('should provide coverage', function() {
-    // Simply run the thing and make sure it does not fail and that all of the
-    // stub methods are executed
-    var visitor = new Handlebars.Visitor();
-    visitor.accept(Handlebars.parse('{{foo}}{{#foo (bar 1 "1" true undefined null) foo=@data}}{{!comment}}{{> bar }} {{/foo}}'));
-  });
-
-  it('should traverse to stubs', function() {
-    var visitor = new Handlebars.Visitor();
-
-    visitor.StringLiteral = function(string) {
-      equal(string.value, '2');
-    };
-    visitor.NumberLiteral = function(number) {
-      equal(number.value, 1);
-    };
-    visitor.BooleanLiteral = function(bool) {
-      equal(bool.value, true);
-
-      equal(this.parents.length, 3);
-      equal(this.parents[0].type, 'SubExpression');
-      equal(this.parents[1].type, 'BlockStatement');
-      equal(this.parents[2].type, 'Program');
-    };
-    visitor.PathExpression = function(id) {
-      equal(/(foo\.)?bar$/.test(id.original), true);
-    };
-    visitor.ContentStatement = function(content) {
-      equal(content.value, ' ');
-    };
-    visitor.CommentStatement = function(comment) {
-      equal(comment.value, 'comment');
-    };
-
-    visitor.accept(Handlebars.parse('{{#foo.bar (foo.bar 1 "2" true) foo=@foo.bar}}{{!comment}}{{> bar }} {{/foo.bar}}'));
-  });
-
-  it('should return undefined');
-
-  describe('mutating', function() {
-    describe('fields', function() {
-      it('should replace value', function() {
-        var visitor = new Handlebars.Visitor();
-
-        visitor.mutating = true;
-        visitor.StringLiteral = function(string) {
-          return new Handlebars.AST.NumberLiteral(42, string.locInfo);
-        };
-
-        var ast = Handlebars.parse('{{foo foo="foo"}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [] HASH{foo=NUMBER{42}} }}\n');
-      });
-      it('should treat undefined resonse as identity', function() {
-        var visitor = new Handlebars.Visitor();
-        visitor.mutating = true;
-
-        var ast = Handlebars.parse('{{foo foo=42}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [] HASH{foo=NUMBER{42}} }}\n');
-      });
-      it('should remove false responses', function() {
-        var visitor = new Handlebars.Visitor();
-
-        visitor.mutating = true;
-        visitor.Hash = function() {
-          return false;
-        };
-
-        var ast = Handlebars.parse('{{foo foo=42}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [] }}\n');
-      });
-      it('should throw when removing required values', function() {
-        shouldThrow(function() {
-          var visitor = new Handlebars.Visitor();
-
-          visitor.mutating = true;
-          visitor.PathExpression = function() {
-            return false;
-          };
-
-          var ast = Handlebars.parse('{{foo 42}}');
-          visitor.accept(ast);
-        }, Handlebars.Exception, 'MustacheStatement requires path');
-      });
-      it('should throw when returning non-node responses', function() {
-        shouldThrow(function() {
-          var visitor = new Handlebars.Visitor();
-
-          visitor.mutating = true;
-          visitor.PathExpression = function() {
-            return {};
-          };
-
-          var ast = Handlebars.parse('{{foo 42}}');
-          visitor.accept(ast);
-        }, Handlebars.Exception, 'Unexpected node type "undefined" found when accepting path on MustacheStatement');
-      });
-    });
-    describe('arrays', function() {
-      it('should replace value', function() {
-        var visitor = new Handlebars.Visitor();
-
-        visitor.mutating = true;
-        visitor.StringLiteral = function(string) {
-          return new Handlebars.AST.NumberLiteral(42, string.locInfo);
-        };
-
-        var ast = Handlebars.parse('{{foo "foo"}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [NUMBER{42}] }}\n');
-      });
-      it('should treat undefined resonse as identity', function() {
-        var visitor = new Handlebars.Visitor();
-        visitor.mutating = true;
-
-        var ast = Handlebars.parse('{{foo 42}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [NUMBER{42}] }}\n');
-      });
-      it('should remove false responses', function() {
-        var visitor = new Handlebars.Visitor();
-
-        visitor.mutating = true;
-        visitor.NumberLiteral = function() {
-          return false;
-        };
-
-        var ast = Handlebars.parse('{{foo 42}}');
-        visitor.accept(ast);
-        equals(Handlebars.print(ast), '{{ PATH:foo [] }}\n');
-      });
-    });
-  });
-});
diff --git a/lib/handlebars/spec/whitespace-control.js b/lib/handlebars/spec/whitespace-control.js
deleted file mode 100644
index a5c9bf14d..000000000
--- a/lib/handlebars/spec/whitespace-control.js
+++ /dev/null
@@ -1,77 +0,0 @@
-describe('whitespace control', function() {
-  it('should strip whitespace around mustache calls', function() {
-    var hash = {foo: 'bar<'};
-
-    shouldCompileTo(' {{~foo~}} ', hash, 'bar&lt;');
-    shouldCompileTo(' {{~foo}} ', hash, 'bar&lt; ');
-    shouldCompileTo(' {{foo~}} ', hash, ' bar&lt;');
-
-    shouldCompileTo(' {{~&foo~}} ', hash, 'bar<');
-    shouldCompileTo(' {{~{foo}~}} ', hash, 'bar<');
-
-    shouldCompileTo('1\n{{foo~}} \n\n 23\n{{bar}}4', {}, '1\n23\n4');
-  });
-
-  describe('blocks', function() {
-    it('should strip whitespace around simple block calls', function() {
-      var hash = {foo: 'bar<'};
-
-      shouldCompileTo(' {{~#if foo~}} bar {{~/if~}} ', hash, 'bar');
-      shouldCompileTo(' {{#if foo~}} bar {{/if~}} ', hash, ' bar ');
-      shouldCompileTo(' {{~#if foo}} bar {{~/if}} ', hash, ' bar ');
-      shouldCompileTo(' {{#if foo}} bar {{/if}} ', hash, '  bar  ');
-
-      shouldCompileTo(' \n\n{{~#if foo~}} \n\nbar \n\n{{~/if~}}\n\n ', hash, 'bar');
-      shouldCompileTo(' a\n\n{{~#if foo~}} \n\nbar \n\n{{~/if~}}\n\na ', hash, ' abara ');
-    });
-    it('should strip whitespace around inverse block calls', function() {
-      var hash = {};
-
-      shouldCompileTo(' {{~^if foo~}} bar {{~/if~}} ', hash, 'bar');
-      shouldCompileTo(' {{^if foo~}} bar {{/if~}} ', hash, ' bar ');
-      shouldCompileTo(' {{~^if foo}} bar {{~/if}} ', hash, ' bar ');
-      shouldCompileTo(' {{^if foo}} bar {{/if}} ', hash, '  bar  ');
-
-      shouldCompileTo(' \n\n{{~^if foo~}} \n\nbar \n\n{{~/if~}}\n\n ', hash, 'bar');
-    });
-    it('should strip whitespace around complex block calls', function() {
-      var hash = {foo: 'bar<'};
-
-      shouldCompileTo('{{#if foo~}} bar {{~^~}} baz {{~/if}}', hash, 'bar');
-      shouldCompileTo('{{#if foo~}} bar {{^~}} baz {{/if}}', hash, 'bar ');
-      shouldCompileTo('{{#if foo}} bar {{~^~}} baz {{~/if}}', hash, ' bar');
-      shouldCompileTo('{{#if foo}} bar {{^~}} baz {{/if}}', hash, ' bar ');
-
-      shouldCompileTo('{{#if foo~}} bar {{~else~}} baz {{~/if}}', hash, 'bar');
-
-      shouldCompileTo('\n\n{{~#if foo~}} \n\nbar \n\n{{~^~}} \n\nbaz \n\n{{~/if~}}\n\n', hash, 'bar');
-      shouldCompileTo('\n\n{{~#if foo~}} \n\n{{{foo}}} \n\n{{~^~}} \n\nbaz \n\n{{~/if~}}\n\n', hash, 'bar<');
-
-      hash = {};
-
-      shouldCompileTo('{{#if foo~}} bar {{~^~}} baz {{~/if}}', hash, 'baz');
-      shouldCompileTo('{{#if foo}} bar {{~^~}} baz {{/if}}', hash, 'baz ');
-      shouldCompileTo('{{#if foo~}} bar {{~^}} baz {{~/if}}', hash, ' baz');
-      shouldCompileTo('{{#if foo~}} bar {{~^}} baz {{/if}}', hash, ' baz ');
-
-      shouldCompileTo('{{#if foo~}} bar {{~else~}} baz {{~/if}}', hash, 'baz');
-
-      shouldCompileTo('\n\n{{~#if foo~}} \n\nbar \n\n{{~^~}} \n\nbaz \n\n{{~/if~}}\n\n', hash, 'baz');
-    });
-  });
-
-  it('should strip whitespace around partials', function() {
-    shouldCompileToWithPartials('foo {{~> dude~}} ', [{}, {}, {dude: 'bar'}], true, 'foobar');
-    shouldCompileToWithPartials('foo {{> dude~}} ', [{}, {}, {dude: 'bar'}], true, 'foo bar');
-    shouldCompileToWithPartials('foo {{> dude}} ', [{}, {}, {dude: 'bar'}], true, 'foo bar ');
-
-    shouldCompileToWithPartials('foo\n {{~> dude}} ', [{}, {}, {dude: 'bar'}], true, 'foobar');
-    shouldCompileToWithPartials('foo\n {{> dude}} ', [{}, {}, {dude: 'bar'}], true, 'foo\n bar');
-  });
-
-  it('should only strip whitespace once', function() {
-    var hash = {foo: 'bar'};
-
-    shouldCompileTo(' {{~foo~}} {{foo}} {{foo}} ', hash, 'barbar bar ');
-  });
-});
diff --git a/lib/handlebars/src/handlebars.l b/lib/handlebars/src/handlebars.l
deleted file mode 100644
index ff2128355..000000000
--- a/lib/handlebars/src/handlebars.l
+++ /dev/null
@@ -1,116 +0,0 @@
-
-%x mu emu com raw
-
-%{
-
-function strip(start, end) {
-  return yytext = yytext.substr(start, yyleng-end);
-}
-
-%}
-
-LEFT_STRIP    "~"
-RIGHT_STRIP   "~"
-
-LOOKAHEAD           [=~}\s\/.)|]
-LITERAL_LOOKAHEAD   [~}\s)]
-
-/*
-ID is the inverse of control characters.
-Control characters ranges:
-  [\s]          Whitespace
-  [!"#%-,\./]   !, ", #, %, &, ', (, ), *, +, ,, ., /,  Exceptions in range: $, -
-  [;->@]        ;, <, =, >, @,                          Exceptions in range: :, ?
-  [\[-\^`]      [, \, ], ^, `,                          Exceptions in range: _
-  [\{-~]        {, |, }, ~
-*/
-ID    [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
-
-%%
-
-[^\x00]*?/("{{")                {
-                                   if(yytext.slice(-2) === "\\\\") {
-                                     strip(0,1);
-                                     this.begin("mu");
-                                   } else if(yytext.slice(-1) === "\\") {
-                                     strip(0,1);
-                                     this.begin("emu");
-                                   } else {
-                                     this.begin("mu");
-                                   }
-                                   if(yytext) return 'CONTENT';
-                                 }
-
-[^\x00]+                         return 'CONTENT';
-
-// marks CONTENT up to the next mustache or escaped mustache
-<emu>[^\x00]{2,}?/("{{"|"\\{{"|"\\\\{{"|<<EOF>>) {
-                                   this.popState();
-                                   return 'CONTENT';
-                                 }
-
-<raw>"{{{{/"[^\s!"#%-,\.\/;->@\[-\^`\{-~]+/[=}\s\/.]"}}}}" {
-                                  yytext = yytext.substr(5, yyleng-9);
-                                  this.popState();
-                                  return 'END_RAW_BLOCK';
-                                 }
-<raw>[^\x00]*?/("{{{{/")         { return 'CONTENT'; }
-
-<com>[\s\S]*?"--"{RIGHT_STRIP}?"}}" {
-  this.popState();
-  return 'COMMENT';
-}
-
-<mu>"("                          return 'OPEN_SEXPR';
-<mu>")"                          return 'CLOSE_SEXPR';
-
-<mu>"{{{{"                       { return 'OPEN_RAW_BLOCK'; }
-<mu>"}}}}"                       {
-                                  this.popState();
-                                  this.begin('raw');
-                                  return 'CLOSE_RAW_BLOCK';
-                                 }
-<mu>"{{"{LEFT_STRIP}?">"         return 'OPEN_PARTIAL';
-<mu>"{{"{LEFT_STRIP}?"#"         return 'OPEN_BLOCK';
-<mu>"{{"{LEFT_STRIP}?"/"         return 'OPEN_ENDBLOCK';
-<mu>"{{"{LEFT_STRIP}?"^"\s*{RIGHT_STRIP}?"}}"        this.popState(); return 'INVERSE';
-<mu>"{{"{LEFT_STRIP}?\s*"else"\s*{RIGHT_STRIP}?"}}"  this.popState(); return 'INVERSE';
-<mu>"{{"{LEFT_STRIP}?"^"         return 'OPEN_INVERSE';
-<mu>"{{"{LEFT_STRIP}?\s*"else"   return 'OPEN_INVERSE_CHAIN';
-<mu>"{{"{LEFT_STRIP}?"{"         return 'OPEN_UNESCAPED';
-<mu>"{{"{LEFT_STRIP}?"&"         return 'OPEN';
-<mu>"{{"{LEFT_STRIP}?"!--" {
-  this.unput(yytext);
-  this.popState();
-  this.begin('com');
-}
-<mu>"{{"{LEFT_STRIP}?"!"[\s\S]*?"}}" {
-  this.popState();
-  return 'COMMENT';
-}
-<mu>"{{"{LEFT_STRIP}?            return 'OPEN';
-
-<mu>"="                          return 'EQUALS';
-<mu>".."                         return 'ID';
-<mu>"."/{LOOKAHEAD}              return 'ID';
-<mu>[\/.]                        return 'SEP';
-<mu>\s+                          // ignore whitespace
-<mu>"}"{RIGHT_STRIP}?"}}"        this.popState(); return 'CLOSE_UNESCAPED';
-<mu>{RIGHT_STRIP}?"}}"           this.popState(); return 'CLOSE';
-<mu>'"'("\\"["]|[^"])*'"'        yytext = strip(1,2).replace(/\\"/g,'"'); return 'STRING';
-<mu>"'"("\\"[']|[^'])*"'"        yytext = strip(1,2).replace(/\\'/g,"'"); return 'STRING';
-<mu>"@"                          return 'DATA';
-<mu>"true"/{LITERAL_LOOKAHEAD}   return 'BOOLEAN';
-<mu>"false"/{LITERAL_LOOKAHEAD}  return 'BOOLEAN';
-<mu>"undefined"/{LITERAL_LOOKAHEAD} return 'UNDEFINED';
-<mu>"null"/{LITERAL_LOOKAHEAD}   return 'NULL';
-<mu>\-?[0-9]+(?:\.[0-9]+)?/{LITERAL_LOOKAHEAD} return 'NUMBER';
-<mu>"as"\s+"|"                   return 'OPEN_BLOCK_PARAMS';
-<mu>"|"                          return 'CLOSE_BLOCK_PARAMS';
-
-<mu>{ID}                         return 'ID';
-
-<mu>'['[^\]]*']'                 return 'ID';
-<mu>.                            return 'INVALID';
-
-<INITIAL,mu><<EOF>>              return 'EOF';
diff --git a/lib/handlebars/src/handlebars.yy b/lib/handlebars/src/handlebars.yy
deleted file mode 100644
index d67a7da7e..000000000
--- a/lib/handlebars/src/handlebars.yy
+++ /dev/null
@@ -1,130 +0,0 @@
-%start root
-
-%ebnf
-
-%%
-
-root
-  : program EOF { return $1; }
-  ;
-
-program
-  : statement* -> new yy.Program($1, null, {}, yy.locInfo(@$))
-  ;
-
-statement
-  : mustache -> $1
-  | block -> $1
-  | rawBlock -> $1
-  | partial -> $1
-  | content -> $1
-  | COMMENT -> new yy.CommentStatement(yy.stripComment($1), yy.stripFlags($1, $1), yy.locInfo(@$))
-  ;
-
-content
-  : CONTENT -> new yy.ContentStatement($1, yy.locInfo(@$))
-  ;
-
-rawBlock
-  : openRawBlock content END_RAW_BLOCK -> yy.prepareRawBlock($1, $2, $3, @$)
-  ;
-
-openRawBlock
-  : OPEN_RAW_BLOCK helperName param* hash? CLOSE_RAW_BLOCK -> { path: $2, params: $3, hash: $4 }
-  ;
-
-block
-  : openBlock program inverseChain? closeBlock -> yy.prepareBlock($1, $2, $3, $4, false, @$)
-  | openInverse program inverseAndProgram? closeBlock -> yy.prepareBlock($1, $2, $3, $4, true, @$)
-  ;
-
-openBlock
-  : OPEN_BLOCK helperName param* hash? blockParams? CLOSE -> { path: $2, params: $3, hash: $4, blockParams: $5, strip: yy.stripFlags($1, $6) }
-  ;
-
-openInverse
-  : OPEN_INVERSE helperName param* hash? blockParams? CLOSE -> { path: $2, params: $3, hash: $4, blockParams: $5, strip: yy.stripFlags($1, $6) }
-  ;
-
-openInverseChain
-  : OPEN_INVERSE_CHAIN helperName param* hash? blockParams? CLOSE -> { path: $2, params: $3, hash: $4, blockParams: $5, strip: yy.stripFlags($1, $6) }
-  ;
-
-inverseAndProgram
-  : INVERSE program -> { strip: yy.stripFlags($1, $1), program: $2 }
-  ;
-
-inverseChain
-  : openInverseChain program inverseChain? {
-    var inverse = yy.prepareBlock($1, $2, $3, $3, false, @$),
-        program = new yy.Program([inverse], null, {}, yy.locInfo(@$));
-    program.chained = true;
-
-    $$ = { strip: $1.strip, program: program, chain: true };
-  }
-  | inverseAndProgram -> $1
-  ;
-
-closeBlock
-  : OPEN_ENDBLOCK helperName CLOSE -> {path: $2, strip: yy.stripFlags($1, $3)}
-  ;
-
-mustache
-  // Parsing out the '&' escape token at AST level saves ~500 bytes after min due to the removal of one parser node.
-  // This also allows for handler unification as all mustache node instances can utilize the same handler
-  : OPEN helperName param* hash? CLOSE -> yy.prepareMustache($2, $3, $4, $1, yy.stripFlags($1, $5), @$)
-  | OPEN_UNESCAPED helperName param* hash? CLOSE_UNESCAPED -> yy.prepareMustache($2, $3, $4, $1, yy.stripFlags($1, $5), @$)
-  ;
-
-partial
-  : OPEN_PARTIAL partialName param* hash? CLOSE -> new yy.PartialStatement($2, $3, $4, yy.stripFlags($1, $5), yy.locInfo(@$))
-  ;
-
-param
-  : helperName -> $1
-  | sexpr -> $1
-  ;
-
-sexpr
-  : OPEN_SEXPR helperName param* hash? CLOSE_SEXPR -> new yy.SubExpression($2, $3, $4, yy.locInfo(@$))
-  ;
-
-hash
-  : hashSegment+ -> new yy.Hash($1, yy.locInfo(@$))
-  ;
-
-hashSegment
-  : ID EQUALS param -> new yy.HashPair(yy.id($1), $3, yy.locInfo(@$))
-  ;
-
-blockParams
-  : OPEN_BLOCK_PARAMS ID+ CLOSE_BLOCK_PARAMS -> yy.id($2)
-  ;
-
-helperName
-  : path -> $1
-  | dataName -> $1
-  | STRING -> new yy.StringLiteral($1, yy.locInfo(@$))
-  | NUMBER -> new yy.NumberLiteral($1, yy.locInfo(@$))
-  | BOOLEAN -> new yy.BooleanLiteral($1, yy.locInfo(@$))
-  | UNDEFINED -> new yy.UndefinedLiteral(yy.locInfo(@$))
-  | NULL -> new yy.NullLiteral(yy.locInfo(@$))
-  ;
-
-partialName
-  : helperName -> $1
-  | sexpr -> $1
-  ;
-
-dataName
-  : DATA pathSegments -> yy.preparePath(true, $2, @$)
-  ;
-
-path
-  : pathSegments -> yy.preparePath(false, $1, @$)
-  ;
-
-pathSegments
-  : pathSegments SEP ID { $1.push({part: yy.id($3), original: $3, separator: $2}); $$ = $1; }
-  | ID -> [{part: yy.id($1), original: $1}]
-  ;
diff --git a/lib/handlebars/src/parser-prefix.js b/lib/handlebars/src/parser-prefix.js
deleted file mode 100644
index e26b99340..000000000
--- a/lib/handlebars/src/parser-prefix.js
+++ /dev/null
@@ -1 +0,0 @@
-/* istanbul ignore next */
diff --git a/lib/handlebars/src/parser-suffix.js b/lib/handlebars/src/parser-suffix.js
deleted file mode 100644
index 6e4aa20d6..000000000
--- a/lib/handlebars/src/parser-suffix.js
+++ /dev/null
@@ -1 +0,0 @@
-export default handlebars;
diff --git a/lib/handlebars/tasks/metrics.js b/lib/handlebars/tasks/metrics.js
deleted file mode 100644
index c4a202b15..000000000
--- a/lib/handlebars/tasks/metrics.js
+++ /dev/null
@@ -1,63 +0,0 @@
-var _ = require('underscore'),
-    async = require('async'),
-    git = require('./util/git'),
-    Keen = require('keen.io'),
-    metrics = require('../bench');
-
-module.exports = function(grunt) {
-  grunt.registerTask('metrics', function() {
-    var done = this.async(),
-        execName = grunt.option('name'),
-        events = {},
-
-        projectId = process.env.KEEN_PROJECTID,
-        writeKey = process.env.KEEN_WRITEKEY,
-        keen;
-
-    if (!execName && projectId && writeKey) {
-      keen = Keen.configure({
-        projectId: projectId,
-        writeKey: writeKey
-      });
-    }
-
-    async.each(_.keys(metrics), function(name, complete) {
-        if (/^_/.test(name) || (execName && name !== execName)) {
-          return complete();
-        }
-
-        metrics[name](grunt, function(data) {
-          events[name] = data;
-          complete();
-        });
-      },
-      function() {
-        if (!keen) {
-          return done();
-        }
-
-        emit(keen, events, function(err, res) {
-          if (err) {
-            throw err;
-          }
-
-          grunt.log.writeln('Metrics recorded.');
-          done();
-        });
-      });
-  });
-};
-function emit(keen, collections, callback) {
-  git.commitInfo(function(err, info) {
-    _.each(collections, function(collection) {
-      _.each(collection, function(event) {
-        if (info.tagName) {
-          event.tag = info.tagName;
-        }
-        event.sha = info.head;
-      });
-    });
-
-    keen.addEvents(collections, callback);
-  });
-}
diff --git a/lib/handlebars/tasks/parser.js b/lib/handlebars/tasks/parser.js
deleted file mode 100644
index 47533cedf..000000000
--- a/lib/handlebars/tasks/parser.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var childProcess = require('child_process');
-
-module.exports = function(grunt) {
-  grunt.registerTask('parser', 'Generate jison parser.', function() {
-    var done = this.async();
-
-    var cmd = './node_modules/.bin/jison';
-
-    if(process.platform === 'win32'){
-        cmd = 'node_modules\\.bin\\jison.cmd';
-    }
-
-    var child = childProcess.spawn(cmd, ['-m', 'js', 'src/handlebars.yy', 'src/handlebars.l'], {stdio: 'inherit'});
-    child.on('exit', function(code) {
-      if (code != 0) {
-        grunt.fatal('Jison failure: ' + code);
-        done();
-        return;
-      }
-
-      var src = ['src/parser-prefix.js', 'handlebars.js', 'src/parser-suffix.js'].map(grunt.file.read).join('');
-      grunt.file.delete('handlebars.js');
-
-      grunt.file.write('lib/handlebars/compiler/parser.js', src);
-      grunt.log.writeln('Parser "lib/handlebars/compiler/parser.js" created.');
-      done();
-    });
-  });
-};
diff --git a/lib/handlebars/tasks/publish.js b/lib/handlebars/tasks/publish.js
deleted file mode 100644
index 68b3157aa..000000000
--- a/lib/handlebars/tasks/publish.js
+++ /dev/null
@@ -1,83 +0,0 @@
-var _ = require('underscore'),
-    async = require('async'),
-    AWS = require('aws-sdk'),
-    git = require('./util/git'),
-    semver = require('semver');
-
-module.exports = function(grunt) {
-  grunt.registerTask('publish:latest', function() {
-    var done = this.async();
-
-    git.debug(function(remotes, branches) {
-      grunt.log.writeln('remotes: ' + remotes);
-      grunt.log.writeln('branches: ' + branches);
-
-      git.commitInfo(function(err, info) {
-        grunt.log.writeln('tag: ' + info.tagName);
-
-        if (info.isMaster) {
-          initSDK();
-
-          var files = ['-latest', '-' + info.head];
-          if (info.tagName && semver.valid(info.tagName)) {
-            files.push('-' + info.tagName);
-          }
-
-          publish(fileMap(files), done);
-        } else {
-          // Silently ignore for branches
-          done();
-        }
-      });
-    });
-  });
-  grunt.registerTask('publish:version', function() {
-    var done = this.async();
-    initSDK();
-
-    git.commitInfo(function(err, info) {
-      if (!info.tagName) {
-        throw new Error('The current commit must be tagged');
-      }
-      publish(fileMap(['-' + info.tagName]), done);
-    });
-  });
-
-  function initSDK() {
-    var bucket = process.env.S3_BUCKET_NAME,
-        key = process.env.S3_ACCESS_KEY_ID,
-        secret = process.env.S3_SECRET_ACCESS_KEY;
-
-    if (!bucket || !key || !secret) {
-      throw new Error('Missing S3 config values');
-    }
-
-    AWS.config.update({accessKeyId: key, secretAccessKey: secret});
-  }
-  function publish(files, callback) {
-    var s3 = new AWS.S3(),
-        bucket = process.env.S3_BUCKET_NAME;
-
-    async.forEach(_.keys(files), function(file, callback) {
-        var params = {Bucket: bucket, Key: file, Body: grunt.file.read(files[file])};
-        s3.putObject(params, function(err, data) {
-          if (err) {
-            throw err;
-          } else {
-            grunt.log.writeln('Published ' + file + ' to build server.');
-            callback();
-          }
-        });
-      },
-      callback);
-  }
-  function fileMap(suffixes) {
-    var map = {};
-    _.each(['handlebars.js', 'handlebars.min.js', 'handlebars.runtime.js', 'handlebars.runtime.min.js'], function(file) {
-      _.each(suffixes, function(suffix) {
-        map[file.replace(/\.js$/, suffix + '.js')] = 'dist/' + file;
-      });
-    });
-    return map;
-  }
-};
diff --git a/lib/handlebars/tasks/test.js b/lib/handlebars/tasks/test.js
deleted file mode 100644
index ad8a911d3..000000000
--- a/lib/handlebars/tasks/test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var childProcess = require('child_process'),
-    fs = require('fs');
-
-module.exports = function(grunt) {
-  grunt.registerTask('test:bin', function() {
-    var done = this.async();
-
-    childProcess.exec('./bin/handlebars -a spec/artifacts/empty.handlebars', function(err, stdout) {
-      if (err) {
-        throw err;
-      }
-
-      var expected = fs.readFileSync('./spec/expected/empty.amd.js');
-      if (stdout.toString() !== expected.toString()) {
-        throw new Error('Expected binary output differed:\n\n"' + stdout + '"\n\n"' + expected + '"');
-      }
-
-      done();
-    });
-  });
-  grunt.registerTask('test:mocha', function() {
-    var done = this.async();
-
-    var runner = childProcess.fork('./spec/env/runner', [], {stdio: 'inherit'});
-    runner.on('close', function(code) {
-      if (code != 0) {
-        grunt.fatal(code + ' tests failed');
-      }
-      done();
-    });
-  });
-  grunt.registerTask('test:cov', function() {
-    var done = this.async();
-
-    var runner = childProcess.fork('node_modules/.bin/istanbul', ['cover', '--', './spec/env/runner.js'], {stdio: 'inherit'});
-    runner.on('close', function(code) {
-      if (code != 0) {
-        grunt.fatal(code + ' tests failed');
-      }
-      done();
-    });
-  });
-  grunt.registerTask('test', ['test:bin', 'test:cov']);
-};
diff --git a/lib/handlebars/tasks/util/git.js b/lib/handlebars/tasks/util/git.js
deleted file mode 100644
index a6c9ec1dc..000000000
--- a/lib/handlebars/tasks/util/git.js
+++ /dev/null
@@ -1,107 +0,0 @@
-var childProcess = require('child_process');
-
-module.exports = {
-  debug: function(callback) {
-    childProcess.exec('git remote -v', {}, function(err, remotes) {
-      if (err) {
-        throw new Error('git.remote: ' + err.message);
-      }
-
-      childProcess.exec('git branch -a', {}, function(err, branches) {
-        if (err) {
-          throw new Error('git.branch: ' + err.message);
-        }
-
-        callback(remotes, branches);
-      });
-    });
-  },
-  clean: function(callback) {
-    childProcess.exec('git diff-index --name-only HEAD --', {}, function(err, stdout) {
-      callback(undefined, !err && !stdout);
-    });
-  },
-
-  commitInfo: function(callback) {
-    module.exports.head(function(err, headSha) {
-      module.exports.master(function(err, masterSha) {
-        module.exports.tagName(function(err, tagName) {
-          callback(undefined, {
-            head: headSha,
-            master: masterSha,
-            tagName: tagName,
-            isMaster: headSha === masterSha
-          });
-        });
-      });
-    });
-  },
-
-  head: function(callback) {
-    childProcess.exec('git rev-parse --short HEAD', {}, function(err, stdout) {
-      if (err) {
-        throw new Error('git.head: ' + err.message);
-      }
-
-      callback(undefined, stdout.trim());
-    });
-  },
-  master: function(callback) {
-    childProcess.exec('git rev-parse --short origin/master', {}, function(err, stdout) {
-      // This will error if master was not checked out but in this case we know we are not master
-      // so we can ignore.
-      if (err && !/Needed a single revision/.test(err.message)) {
-        throw new Error('git.master: ' + err.message);
-      }
-
-      callback(undefined, stdout.trim());
-    });
-  },
-
-  add: function(path, callback) {
-    childProcess.exec('git add -f ' + path, {}, function(err, stdout) {
-      if (err) {
-        throw new Error('git.add: ' + err.message);
-      }
-
-      callback();
-    });
-  },
-  commit: function(name, callback) {
-    childProcess.exec('git commit --message=' + name, {}, function(err, stdout) {
-      if (err) {
-        throw new Error('git.commit: ' + err.message);
-      }
-
-      callback();
-    });
-  },
-  tag: function(name, callback) {
-    childProcess.exec('git tag -a --message=' + name + ' ' + name, {}, function(err, stdout, stderr) {
-      if (err) {
-        throw new Error('git.tag: ' + err.message);
-      }
-
-      callback();
-    });
-  },
-  tagName: function(callback) {
-    childProcess.exec('git describe --tags', {}, function(err, stdout) {
-      if (err) {
-        throw new Error('git.tagName: ' + err.message);
-      }
-
-      var tags = stdout.trim().split(/\n/);
-      tags = tags.filter(function(info) {
-        info = info.split('-');
-        return info.length == 1;
-      });
-
-      var versionTags = tags.filter(function(info) {
-        return /^v/.test(info[0]);
-      });
-
-      callback(undefined, versionTags[0] || tags[0]);
-    });
-  }
-};
diff --git a/lib/handlebars/tasks/version.js b/lib/handlebars/tasks/version.js
deleted file mode 100644
index e6bfe5943..000000000
--- a/lib/handlebars/tasks/version.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var async = require('async'),
-    git = require('./util/git'),
-    semver = require('semver');
-
-module.exports = function(grunt) {
-  grunt.registerTask('version', 'Updates the current release version', function() {
-    var done = this.async(),
-        pkg = grunt.config('pkg'),
-        version = grunt.option('ver');
-
-    if (!semver.valid(version)) {
-      throw new Error('Must provide a version number (Ex: --ver=1.0.0):\n\t' + version + '\n\n');
-    }
-
-    pkg.version = version;
-    grunt.config('pkg', pkg);
-
-    grunt.log.writeln('Updating to version ' + version);
-
-    async.each([
-        ['lib/handlebars/base.js', /var VERSION = ['"](.*)['"];/, 'var VERSION = "' + version + '";'],
-        ['components/bower.json', /"version":.*/, '"version": "' + version + '",'],
-        ['components/handlebars.js.nuspec', /<version>.*<\/version>/, '<version>' + version + '</version>']
-      ],
-      function(args, callback) {
-        replace.apply(undefined, args);
-        grunt.log.writeln('    - ' + args[0]);
-        git.add(args[0], callback);
-      },
-      function() {
-        grunt.task.run(['default']);
-        done();
-      });
-  });
-
-  function replace(path, regex, replace) {
-    var content = grunt.file.read(path);
-    content = content.replace(regex, replace);
-    grunt.file.write(path, content);
-  }
-};