Introducing the collector module (work in progress)
Minor fixes to hypercolumn code and style