Document new command line options
Fix tests for when your stupid ISP hijacks nonexistant URLs