I've been trying to keep our two branches as in-sync as possible, but its time to do a pull I think.

I have been pulling from your testing regularly so there should not be any conflicts. In fact a lot of the changes listed aren't even different from what you have so I don't know why github thinks they are. Anyway, this should get them back on track!