Merge pull request #16 from trident-systems/master

Display user answers on the results page
mostly pep8
Allow the display order of multichoice options to be specified