New upstream version, clean ups and small fixes

@mtmiller I'd like to help with this package too from the openconnect family, so I've added myself as uploader. Does that sound ok for you? Thanks!