Misc updates for latest virtualenv/virtualenvwrapper