Handle pip package conflicts differently.

Instead of completly dying when a installed pip does not
match a desired pip, check if desired pip has the upgrade
option and if so, then allow install to proceed.
Merge pull request #376 from harlowja/master

Handle pip upgrades slightly better.