fix some typos
fail merge with upstream
fixed typo in DefaultForm
Merge pull request #34 from dmouse/master

fixed some typos