Update .gitignore

Ignore more files so we don't have git complaining.
Update .gitignore

Ignoring .DS_Store files generated by OS X
Merge branch 'master' into osxRsrcFork
The main reason why we're doing this is for the git ignores.