Nick handling even better
Merge branch 'master' of https://github.com/hrna/phpBot

Conflicts:
	config.php
	phpbot.php