removed unecessary files and fixed some setup
merge changes from upstream
fixed setup.py to put spa_py in the right place

fixed setup.py to put spa_py in the right place