Add gapless grid; still need to work on useless gaps for it
Fix conflict in config.h
Various small tweaks to co; Fix GaplessGrid?
Merge...