Merge branch 'upstream' into jsx

Conflicts:
	acorn.js
	test/run.js
Update version.
Fix ignored whitespaces before children elements.

Similar to 790afe (template literals).
Fixes #4.
Merge https://github.com/RReverser/acorn-jsx

Conflicts:
	acorn.js
	package.json