minor edits
Merge branch 'feature' of https://github.com/Hybridity/GPUImage into feature
remove old conflict markers