Update setup.py 

Merge branch 'develop' into release-2.1 

Update setup.py for 2.0 release. 

merged method selections and fixes from the trunk