Remove additional "/" from merged URLs.

Issue: #81
Add case for 7.1 audio.
Make mpd parser more ameanable for extension.
Merge pull request #83 from google/dev

Pull dev -> dev-l