Ignore some atom files
Something really wants this media filter in my git config
Merge branch 'master' into atom