Fixing require chai
Merge branch 'master' into testling

* master:
  Fixing require chai

Conflicts:
	test/_spec.coffee