Ignore auto-generated files to prevent merge conflicts

- Add events.json to .gitignore since it's generated during build
- Add .jekyll-metadata to .gitignore since it changes on every build
- Remove these files from git tracking while keeping them in working directory
- This prevents merge conflicts on files that are automatically regenerated

Author: Dale Kunce

.gitignore

@@ -15,6 +15,8 @@ app/assets/scripts/config/local.js
 app/_data/events
 app/_posts
 app/.jekyll-cache
+app/.jekyll-metadata
+app/assets/data/events.json
 
 
 #Foundation additions