Merge spotify changes

Not sure about some of these like removal of $depends etc. But have a look and maybe cherry pick the stuff you like.