Add support for colspans in grids

Completes #43.

Work in progress, please ask permission before merging
---