updated a few docstrings and removed contrib

--HG--
branch : trunk
7 files changed