Try to fix Travis CI MinGW builds

Listing i686-w64-mingw32-gcc as a compiler stopped working.
Travis tries to print version before installing it.

$ i686-w64-mingw32-gcc --version

/home/travis/build.sh: line 201: i686-w64-mingw32-gcc: command not found

The command "i686-w64-mingw32-gcc --version" failed and exited with 127 during setup.
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	travis-ci-build.sh
spearmint: Improve storing collision type for adding new types

This should allow add more types without breaking backward compatibility API.
Merge remote-tracking branch 'upstream/master'