convert tests to mocha
Merge branch 'master' into mocha

Conflicts:
	package.json
Merge pull request #16 from stuartf/mocha

convert tests to mocha