Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL

manually resolved

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #9 from tgfrerer/feature-elinuxProgrammableGL

fix minor shader related catches