site name config entry
Merging
Merge branch 'master' of github.com:stevenleeg/gobb

Conflicts:
	gobb/templates/base.html