Merge branch 'master' into multiple_reporters_support

Conflicts:
	bin/_mocha
	lib/mocha.js
Keep original Mocha.prototype.reporter (singular) for API compatibility
Add/fix tests for multiple reporters