Patch Set 2:

I should also note that the current patch still has the test reporting framework embedded. I've done a bunch of compatibility stuff, but there's probably stuff I've missed so I left the System.out.println's in the code -- I'll update with a non-spammy version after finishing compatibility tests :)