rebuilding the git pull process from scratch, since the simplistic approach we had enjoyed so well for so long totally doesn't work with branches, and our new fangled cobbled together version from across the internet isn't right either. need to build reliable pieces one at a time.