Fix getting the next level of an upgradable power

Fixes #1021
Include upgradable powers in calculation of available power points
Count requires_point for base level of upgradable powers
Merge pull request #1022 from dorkster/menupowers

Fixes for upgradable powers
Merge remote-tracking branch 'upstream/master'