Removed last vestige of sub-bots.

Renamed the main bot class to simply be Bot, and merged it to the once
former common base class.