Updating gitignore
Fixing Event Calendar markup rendering

    - Fixes #435
    - Assumes calendars are safe
Merge branch 'master' into release