Edit: arg --no-upnpigd is now --no-upnp
Merge branch 'master' of github.com:cmol/punchVPN