Merge branch 'pulls/more-swears' of https://git.simon.geek.nz/stevie-mayhew/logbot-www into stevie-mayhew/logbot-www-pulls/more-swears

Conflicts:
	swears.txt