Add fields needed for kayak extra choices selection.
Only expose extra choices if relevant.

Clean up debugging code.
Merge pull request #21 from googletorp/7.x-1.x

Add configurable options to kayak courses