clean up and add virtualenv/wrapper settings