- Don't link against a plugin, this doesn't seem to work anymore, and is a bad practice anyway.
- Merge mapper plugins into the base code, we don't really need these to be separate plug-ins
- Fix some crashes