Better Logic for some stuff

Non Weapon Modules with more then 1 Charge getting reloaded out of
combat
Cap Injector Implementation had a big bug

Shield got recharged when we needed cap (very bad!) and Cap recharged
when we needed Shield boost, this fixes it
Skip Module when in combat
Merge pull request #327 from Daxten/BleedingEdge

Better Logic for some stuff