Update mac configuration 

for now, also about port forwarding if UPnP setup fails and about disabling VPN if necessary until we fix that.
done.  committed, rebased, pushed. need to wait for travis now.