Update setup.py

Is not zip safe
Merge remote-tracking branch 'origin/patch-1'
Removed superfluous generic setup