Switch to grunt-run-task for reasons

Conflicts:
	tasks/lib/test_helper.js
Merge branch 'feature/20-less-timeouts' (fixes #20)

* feature/20-less-timeouts:
  Switch to grunt-run-task for reasons