Pip 1.5 fixes.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>