Merge pull request #320 from tribal-tec/master

Fix OSX build
Minor cleanup
Merge branch 'master' of https://github.com/eile/Equalizer
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Fix OS X build
Merge pull request #321 from eile/master

Fix OS X build
Fix clang build