Package building fixes (#887)

* Fix a couple of errors in make scripts
* Fix snapshot versioning for launchpad

setup/make_clean.sh

@@ -6,4 +6,5 @@ if [ ! -f setup.py ]; then
     exit 1
 fi
 
-python3 setup.py clean
+rm -rfv dist_upload
+python3 setup.py build-clean

setup/make_pip.sh

@@ -25,5 +25,5 @@ echo " Done!"
 echo "================================================================================"
 echo ""
 echo " To upload packages to PyPi, run:"
-echo " twine upload Source/dist/*"
+echo " twine upload dist/*"
 echo ""