Patch 18

Fixes for marine bhop and some mod compatibility.
Dev Publish of Patch 19
Patch 21

Forgot about patch 20 on here :S
Merge pull request #263 from xToken/Dev

Patch Backlog