mocha is not used
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
adding a beta config