Fixes #3204
Cleaned up a lot of the module selection code, added Combat module.
Compile fix.
Merge pull request #3206 from Zuhayr/feature

Cyborg cleanup, fix.