Add back volume button
Nuke scope, since mopidy spotify dun give a fuk
Merge branch 'fix-merge-stuffs'