Reformat package.json - no more leading commas
Refactor some long jade lines
Basic setup for #2474
Merge branch 'master' into gh-2474

Conflicts:
	package.json
Merge pull request #2489 from LearnBoost/gh-2474

Docs for ES6 integration - basic setup