Keep old non-swizzle method around since GL_ARB_texture_swizzle has poor support prior to 3.3 (on osx especially)
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git