Refactored form building/submitting logic.
And... fully working again.
Merge pull request #29 from adam-vessey/7.x-generalize

Refactor display, so as to be able to override things.