Merge pull request #32 from georgecrawford/master

Use margin rather than padding to standardise line-height
Merge remote-tracking branch 'upstream/master'

* upstream/master: