Merge pull request #1108 from onepercentclub/feature/split_form_components

Split form components into separate templates so we can override them.
Merge pull request #1199 from onepercentclub/master

Merge master into dev/onepercent-donations