added virtualenvwrapper exports
fixed merge