Fixed things after somehow screwing up a sync with the remote origin/master.