Don't merge speed effects
Merge pull request #524 from dorkster/bugfixes

Don't merge speed effects
Don't free screen surface when exiting

SDL_Quit() already frees this surface.
Merge pull request #525 from dorkster/bugfixes

Don't free screen surface when exiting
Revert "Don't merge speed effects"

This reverts commit 630964700f7b417fd3785ebbc69286b7be5dda1a.
Merge pull request #526 from dorkster/bugfixes

Revert "Don't merge speed effects"
Fixes #527 and makrohn/polymorphable#36
Merge pull request #528 from makrohn/bugfix

Fixes #527 and makrohn/polymorphable#36
Merge remote-tracking branch 'upstream/master'