Moved doctests in docstrings to separate test files
Updated CHANGES
Merge branch 'master' into issue_28

Conflicts:
	CHANGES.rst
Merge pull request #35 from collective/issue_28

Get rid of doctests in docstrings