Updated setup.py a bit.  This fixes #1018