Fixed some poorly-named macros that were conflicting with other frameworks.
Merge branch 'master' of git://github.com/BradLarson/GPUImage