Update mac configuration 

for now, also about port forwarding if UPnP setup fails and about disabling VPN if necessary until we fix that.
Whitespace still with us. This is not a matter of life and death, just a matter of minimizing the lines touched.