Minor refactor, add setup.py and stupid test
Add support for colspans in grids