don't add __doc__ by default if there's a docstring!
Merge pull request #9 from dannyroberts/__doc__

don't add __doc__ by default if there's a docstring!