...more cleanup, updated .gitignore_global