I just pulled from "master" and everything is up to date.  I merged last night and resolved some conflicts, but I thought I did this before I made the pull request.