Revert "Don't merge speed effects"

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

Revert "Don't merge speed effects"