Merge branch 'master' into es6-modules

Conflicts:
	Gruntfile.js
	Rakefile
	dist/handlebars.js
	dist/handlebars.runtime.js
	lib/handlebars.js
	lib/handlebars/base.js
	lib/handlebars/runtime.js
	lib/handlebars/utils.js
	package.json

package.json

@@ -1,12 +1,8 @@
 {
   "name": "handlebars.js",
   "barename": "handlebars",
-  "version": "1.1.0",
+  "version": "1.0.12",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/wycats/handlebars.js.git"
@@ -15,17 +11,36 @@
   "license": "BSD",
   "readmeFilename": "README.md",
   "devDependencies": {
+    "async": "~0.2.9",
+    "aws-sdk": "~1.5.0",
+    "benchmark": "~1.0",
+    "dustjs-linkedin": "~2.0.2",
+    "eco": "~1.1.0-rc-3",
     "grunt": "~0.4.1",
     "connect": "~2.7.4",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-clean": "~0.4.1",
     "grunt-contrib-connect": "~0.3.0",
+    "grunt-contrib-jshint": "~0.6.3",
+    "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-watch": "~0.4.4",
     "grunt-hang": "~0.1.2",
     "grunt-es6-module-transpiler": "~0.4.1",
     "es6-module-transpiler": "*",
     "jison": "~0.3.0",
+    "keen.io": "0.0.3",
     "mocha": "*",
-    "should": "~1.2.2"
-  }
+    "mustache": "~0.7.2",
+    "semver": "~2.1.0",
+    "should": "~1.2.2",
+    "underscore": "~1.5.1"
+  },
+  "main": "lib/handlebars.js",
+  "bin": {
+    "handlebars": "bin/handlebars"
+  },
+  "scripts": {
+    "test": "node ./spec/env/runner"
+  },
+  "optionalDependencies": {}
 }