remove the v2 files
turn the v2 files into v1
Merge pull request #698 from alphagov/energy_grants_calculator_two_into_one

Updating energy grants calculator for deploying today