Ship Odyssey: Bug Fixes and New Treasure Refactoring

This is the refactored ship odyssey. I've played a handful of games and haven't discovered any new bugs. I think it's ready for more widespread testing and scrutiny. Please pull if it looks good.