Re-enable setup.py options but keep setup.py develop as default
Merge pull request #1048 from bartvm/setup

Re-enable setup.py options but keep setup.py develop as default