Merge pull request #32 from alphagov/better-api

Improve separation of concerns for API
Allow for multiple question types