Changes up to 7.5
Add ignore of emacs temp files and OSX temp files