Merge pull request #58 from mozilla/dev

Merge up from dev to master
Merge pull request #61 from mozilla/dev

Dev
Merge pull request #63 from mozilla/dev

Merging up from dev to master
Merge pull request #65 from mozilla/dev

Merge up from dev to master
Merge pull request #68 from mozilla/dev

Close #66 - merging up from development to live
fixed typo, updated required fields
Merge pull request #72 from erikao/master

attempt 2 fixing a typo, making fields required