Fixing broken merge in setup.py
Fixing broken merge in setup.py

python-wink/python-wink,bradsk88/python-wink,bradsk88/python-wink,balloob/python-wink,python-wink/python-wink,w1ll1am23/python-wink,w1ll1am23/python-wink,balloob/python-wink