fixups to setup.py to include some extra required modules, bundle everything