Finish work on annuity calculations. Other tweaks to calculations and formatting.
Merge pull request #2 from kalebanderson/feature/KA-Annuity

KA-Annuity