Readded doc/ test/ and setup.py
Merge pull request #3983 from mmascher/readd-doc_test_setup

Readded doc/ test/ and setup.py