Merge pull request #351 from mithro/master

Reformatting testharness extra stuff for pending concatenation onto bootstrap.js
Dedent our extension testharness code by 2 space.
Merge pull request #352 from mithro/temp

Dedent our extension testharness code by 2 space.
Merging testharness_* files into bootstrap.js