Last update of the night

I've tweaked the code so when using the flag -i there is no server or
peer listener threads set up. This way we can really test out the upload
connection.