Reverting last commit. I had some staled data from an attempted svnmerge in my local sandbox