Fix errors when compiling shaders with UBOs disabled
Fix up whitespace in shaders.cpp
Fix whitespace in glwrap.cpp