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

Form tweaks for simpler Drupal implementation. Closes #27.