Combined client config bundling parts into single function...
Also changed bundler to generate $CLIENT.ovpn file (for Android/Windows) alongside $CLIENT.conf symlink (for Linux).