Fix over_60 calculation
Remove 'none of these' options, adjust copy
Merge branch 'master' into energy-grants-calculator
Add label for none option
Merge remote branch 'origin/energy-grants-calculator'