Make markup semantic

[jonnyscholes]

Lots of on the fly lazy stuff in here. Naughty Jonny. Make fix.

[joshgillies]

Seems with PR #14 some work has been done toward this. Care to offer an indication whether we can safely pull in these changes?

[jonnyscholes]

Merged safely. I want to remove some of the erroneous markup -.top/.bottom etc. Partially completed on my local. I'll push over the weekend :)