@coreyjv, sorry for the pain--I'd love to help.  Why don't you push the new version of the pull request, and we'll see where to go from there?

You might also want to ask for help on junit@yahoogroups.com.  Since I have the privileged position of working from the master, I may not know all of the rebasing tricks that other frequent contributors due.