fix bug related to upgrade setuptools / pip

Tested in Ubuntu 12.04.3 VMs