Adapt to spotify-make, various fixes

Besides the adaptation to spotify-make (which I think gives a cleaner spec) I also found a can of worms in the filtering (see separate patch).  This took some time to sort out.