Further repackaging. Restored mashup service. Udpate to README