Use margin rather than padding to standardise line-height, as it will collapse at the top of a following columnn
Merge remote-tracking branch 'upstream/master'

* upstream/master:
Merge pull request #32 from georgecrawford/master

Use margin rather than padding to standardise line-height