a few more tweaks to make multi-repo support work, plus some port-mangling that reflects my ignorange of rails