Update gamgee.h and move zip to zip.h

Is there a benefit to including recursively vs. directly?  I prefer to be more explicit like this.