Merge pull request #417 from authenticate/upstream

Cleaning Up an SDL Surface
Attempting to fix the build server.