Adding in the newly added form fields
Merge pull request #67 from rossbruniges/new-form-fields

fix #66 - adding in the newly added form fields
Merge pull request #68 from mozilla/dev

Close #66 - merging up from development to live