fixes colspan width calculations, e.g. #407
Merge branch 'colspan-fixes' of github.com:prawnpdf/prawn into colspan-fixes