Make string building more consistant

Build all of the strings in the same way
Merge branch 'master' of https://github.com/shakabra/pyblog

Merge changes made on github

yup