fiddle with inc path to simplify.  Note we're esentially
reverting back to the original inclusion of a custom subclass
of Module::Build that is local to each branch, but the intent
will eventually be to remove/simplify this dependency