Add in some options for pip 1.5.6 cherry picked in salt.