make a mashup resource thats part solitude part zippy
feedback from @jaredkerim
update docs
Merge pull request #266 from andymckay/zippy-fixin

make a mashup resource thats part solitude part zippy