5.3 Bug Fix

Fix Sub CP builder energy costs.
Merge remote branch 'indz/master'
5.3 Update

- Clean up and simplify code.
- Move a few more abilities over to the preferred method for finding
energy costs.