- fixed issue where error for shader compilation was not getting caught
- fixes for compiling on windows
Merge branch 'master' of ssh://chisholmsoft.com/srv/git/glr

Conflicts:
	SConstruct
- fixed issues caused by merge