Revert "Changed from vim-python2 to using gvim since it is in upstream repos"

This reverts commit 8b8aa37312f1dfe68f18409e8333b6e422d0344e.