Added missing OSX and Linux shaderlibs
Merge remote-tracking branch 'upstream/master'
Update gitignore