Remove src directory.
Get merge_script.js into a test harness.
Merge branch 'master' into refactor-jstests

Conflicts:
	Gruntfile.js
	extension/static/custom/merge_script.js
Fix broken jstests
Merge pull request #60 from tarmstrong/refactor-jstests

Refactor JavaScript test code