Removed a random "git" from the code, recently merged dev into FILES. Resolved the conflicts (probably correctly), ~13 tests fail, but this may be due to a computer-specific problem. Need to actually test on a different computer.
Ned Shelton, Sam Abradi