remove the v2 files
update the v1 files
remove the v2 calculator file
update the v1 calculator
Merge pull request #634 from alphagov/state_pension_checker_two_into_one

Updating State Pension calculator - turning v2 files into v1 so it can be deployed