Merge pull request #1 from bickleydb/master

I refuse to give this a title.
Merge pull request #2 from bickleydb/master

I think it's working now
Merge pull request #3 from bickleydb/master

Final fix of problem
n
Fixed it again.
Changed color blending.
Merge pull request #4 from bickleydb/master

Pulling updates.
Fixed build issues from the merge with Daniel.
Merge pull request #2 from db4soundman/master

Fixed build errors.