tweaked Makefile to use either setup or twine to upload stuff onto pypi