Fixed up column generation
Merge branch 'master' of https://github.com/Brobin/sassy-grid