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
diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 6180daf..3a2558e 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -295,8 +295,8 @@
     def common = new com.mirantis.mk.Common()
 
     // virtualenv setup
-    requirements = ['salt-pepper']
-    setupVirtualenv(path, 'python2', requirements)
+    setupVirtualenv(path, 'python2')
+    runVirtualenvCommand(path, "pip install git+git://github.com/saltstack/pepper.git")
 
     // pepperrc creation
     rcFile = "${path}/pepperrc"