Reconciled local and remote repos. Fixed .gitignore_global problem.
Fixed .gitignore (hopefully)