rm .DS_Store
fixed travis
Merge branch 'master' into entity-cleanup2