Pre's now clear away from floats. Much nicer!
Merge branch 'boilerplate' into gh-pages