bug 865868 Stop removing pip-cache on make clean

Also fixes an inconsistency in how we refer to the pip-cache directory, and adds "make pip_clean" for when we really want to blow it away.