Made some significant improvements including converting to a plugin, complete with Spock unit test.
Performed some housekeeping by removing old task based test.