renaming circuitIPs

[juztas]

Renaming:
--clientcircuitip=CLIENTCIRCUITIP, -i CLIENTCIRCUITIP
optional argument for specifying client circuit IP
--servercircuitip=SERVERCIRCUITIP, -y SERVERCIRCUITIP
optional argument for specifying server circuit IP

and making them for more advanced users.