Boat Movement fixes and tweaks
cache file merge fix
Merge pull request #28 from NarPar/master

Boat Movement Fixes and Tweaks