Fix two Subscribe Button bugs

* Include variant in Subscribe Button shortcode
* Provide correct format for AAC and OGG files in Subscribe Button widget