fix travis
use synirc #goonpug for travis notifications
Merge remote-tracking branch 'upstream/master' into sourcemod

Conflicts:
	.travis.yml