Fixed docstring issue with non-method C++ functions

Sorry, but for some reason it lumped the latest commit from @scopatz when I asked for the pull request. If this creates issues let me know and I'll try again.