Title, intro text, Q1, Q2, Q6, test update
Q7 and Q8 add
Content update and H, I, K, L, N, O, R, S, U, V options remove
Options update and old tests fix
New options and tests add
Content update
Merge pull request #848 from alphagov/energy_grant_calculator_logic_and_content_updates

Smartanswers: Energy grant calculator logic and content updates