Merge pull request #31 from mikedup/27-form-fixes

Form tweaks for simpler Drupal implementation. Closes #27.
Merge pull request #32 from mikedup/master

Merge pull request #31 from mikedup/27-form-fixes