Oops, the last commit had git merge stuff.  This is the proper changes.