fixed merge conflicts and updated event form
ran migration
fixed new event form so there aren't any variables
Merge pull request #23 from daino3/form_fix

Updated the event form partial