Add GL_BindToTMU to reduce redundant calls to glActiveTexture
Don't modify glState.finishCalled in the main thread

The value is used in the renderer thread during RB_SwapBuffers
Disable r_clear by default

This cvar is only meant for debugging purposes and the vanilla renderer disables it by default already
Remove unused renderer cvars
Add ability to merge leaf surfaces by shader
Remove USE_BSP_CLUSTERSURFACE_MERGING
Force disable bsp occlusion queries when smp is enabled
GeoIP support. Will show country name on connection if g_geoip is non-zero.
Add /listgeoip.
Merge remote-tracking branch 'remotes/origin/gameplay/master' into gameplay/viech
Fix up handling of ‘geoip not present’
Tell travis to install libgeoip-dev
Merge remote-tracking branch 'remotes/origin/gameplay/master' into gameplay/viech
Merge branch 'gameplay/viech' into gameplay/devserver

Conflicts:
	src/gamelogic/game/g_client.c
	src/gamelogic/game/g_main.c