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
Fix MAX_ABSORB for enemies