@Contango Hmm...so your git one isn't working but the local one that you tested on and then uploaded to git does ? If so maybe try adding map from your working local to the git repo again. Check to make sure it didn't have any fails or errors. If on terminal I've blown by them before.
You can merge that yourself without updating the map yaml and waiting for it to be merged. Probably best to do that and when it works then update yaml. Make sure to make different version number for the non yaml as well.
When I get it working locally, I copy and save to a folder with that version number and then go to new number when I add to it and test until that works and then repeat the process.
I usually keep all the versions for quite a while until I'm sure it's working correctly. It might fire up and run but when you get 20 rounds in to a test game you see another problem sometimes.
Anyway, not sure if that's what you meant, but you're real close, so as you said, probably something simple.
Edit
Actually I think I remember seeing that error recently. Think it was over the top and it was a naming file structure error. I guess just double check everything against how Frostion did it.