update .gitignore for mac
Merge remote-tracking branch 'origin/devel'