updates to logic, copy and tests after factcheck
more updates to logic, copy and tests
Merge pull request #678 from alphagov/factcheck_amends_to_energy_grants_calculator

Updating energy grants calculator smart-answer to address factcheck comments