Clean up some odd stuff from a merge that showed up.
Clean up some odd stuff from a merge that showed up.

nezticle/ogre,jhu-lcsr-forks/ogre,largerussiangames/ogre,largerussiangames/ogre,nezticle/ogre,vancepym/ogre,jhu-lcsr-forks/ogre,nezticle/ogre,jhu-lcsr-forks/ogre,vancepym/ogre,largerussiangames/ogre,vancepym/ogre,vancepym/ogre,jhu-lcsr-forks/ogre,nezticle/ogre,vancepym/ogre,jhu-lcsr-forks/ogre,largerussiangames/ogre