Merge pull request #270 from stephenplusplus/conflicter

base/run async conflicter resolved.
Mocha generator should point to the right place

Link was pointing to generator testing instead of mocha testing
Merge pull request #271 from eddiemonge/patch-1

Mocha generator should point to the right place
Added regression test for #273
fixes #233 - template race condition.
fixes #273 - async() running check.