Added cycle and uncycle arguments to column()
Added col_or_span argument back into the shift function as the
calculation wasn't working.
Changed col_or_span to type for brevity.
Merge branch 'master' of https://github.com/monkeez/jeet