Continuing with the tidy up
Merge remote-tracking branch 'origin/master'
More tidying up
HTML tidy