Add some missing code, fix some bugs

Forgot to copy over the regex line from when I was editing
in .vim/eclim---whoops!
Merge branch 'dhleong/OnlyShowJUnitWindowOnFailure' into dhleong/all
Fix regex and other issues (hurray working from memory...)
Merge branch 'dhleong/OnlyShowJUnitWindowOnFailure' into dhleong/all