Ignore .DS_Store
Change tabs to spaces for consistency
Merge branch 'clearing-events'