Instructed git to ignore changes in the toshi submodule. Now I have a single command 'make regtest' that launches the whole shebang. A live toshi node, a bitcoind node that automatically connects to the toshi peer. However, bitcoind still disconnects immediatly after that which is annoying and I have to fix next