Merge pull request #38 from SHeimlich/master

Fixing merge issues to include an emulator of testharness.js
Merge remote-tracking branch 'upstream/master'