Merge pull request #26 from ianbarber/master

Small tidy ups
Remove trailing HTML in devsite mode