fixed signup template form merges and dupes
Merge pull request #23 from hmhaley/formfix2

fixed signup template form merges and dupes