completion: remove unneeded local variables
Update PYTHONPATH on activate/deactivate
Add recent improvements from vim-virtualenv