bug 835336: overhaul ship it interface. r=bhearsum