premerge
Merge branch 'master' of https://github.com/wellbourne/blogist

Conflicts:
	index.php
Merge branch 'master' of https://github.com/wellbourne/blogist
file now amended to include full namechange.cfg details