Added option to toggle pet when entering/exiting boats
Set remove-in-boat in config if it doesn't exist
Merge remote-tracking branch 'upstream/master'