Merge pull request #1 from dschaffe/master

Merging Dan's HEAD into origin/master
Fixing issue with qUnit launching from working set
Merge pull request #10 from stevenerat/master

Fixing issue with qUnit launching from working set