Kerry has the extra fields commented out right now, but I updated them anyway
Merge branch 'master' of github.com:punkave/apostrophe-events