Fix two Subscribe Button bugs

* Include variant in Subscribe Button shortcode
* Provide correct format for AAC and OGG files in Subscribe Button widget
Merge pull request #583 from podlove/show-aac-instead-of-m4a

Fix two Subscribe Button bugs