Changed to use package.json to manage certain dependencies
Merge remote-tracking branch 'origin/source' into source

Conflicts:
	app/mocha-scripts/html.ms
	app/scripts/vendor/mochascript-parser/mochascriptParser.js