Merge pull request #266 from andymckay/zippy-fixin

make a mashup resource thats part solitude part zippy
move reference to a seperate dict, stop the mushing