OK. Got things working again for the client... You are correct Vertoe - it was a mess! I apologize!
This is what happened: I was testing the changes on a Linux machine, but my Mac was my production unit (with my tools, DiffMerge, TextWrangler, Github, etc) - so a lot of back and forth...