some fixes to ensure a cleaner compile
Merge branch 'master' into 1.7

Conflicts:
	addons/sourcemod/updatefile.txt
	plugins/trueskill.smx
	scripting/trueskill.sp