fixes for OSX and cleanup of .gitignore files