pepper: Reenable --make-token and cleanup previous virtualenv

https://github.com/saltstack/pepper/pull/110/ enable .peppercache in
custom location using the option -x

Change-Id: Id445f81dc3ab0a762337ac58d629246f5c738cfa
2 files changed