Default to windowed mode
Enable flares by default
Make OpenGL2 default to the same r_mode as GL1
Make GL1 r_mode/r_marksOnTriangleMeshes match Spearmint
Merge remote-tracking branch 'spearmint/master'

Conflicts:
	code/renderergl1/tr_init.c