Seperate Bishop & Knight Outpost Bonuses

Basically what it says...
Modified the formula to make it more transparent.
No functional changes.
Bench 4922272