Fixes sitting on trap, SO_VACUUM_EXTREME and RA_CAMOUFLAGE

- Don't sit while trapped. Bug http://hercules.ws/board/tracker/issue-7825-trap/
SO_VACUUM_EXTREME swapping targets when 2 or more are present and close to each other.
Merge pull request #353 from csnv/tinyfixes

Fixes sitting on trap, SO_VACUUM_EXTREME and RA_CAMOUFLAGE