pull latest from bradlarson/gpuimage

This is my first public merge on github. I'm not sure how this works, sorry if it creates a request under brad's repo :( I just want to merge latest changes into my fork.