update docstrings
Reorg and cleanup, apply changes required for wishbone > 1.0.0a
Reorg and cleanup, apply changes required for wishbone > 1.0.0