More changes.

- Added collision events.
- Villager now extends the Merchant.
- More ai done.
- Added a BetterArrow