Merge branch 'master' of https://github.com/marijnh/acorn

Conflicts:
	README.md
	acorn.js
	package.json

test/run.js

@@ -58,7 +58,6 @@
         parse: (typeof require === "undefined" ? window.acorn : require("../acorn_loose")).parse_dammit,
         loose: true,
         filter: function (test) {
-          if (/`/.test(test.code)) return false; // FIXME remove this when the loose parse supports template strings
           var opts = test.options || {};
           if (opts.loose === false) return false;
           return (opts.ecmaVersion || 5) <= 6;