Revert "Use qvim instead of gvim :>"

This reverts commit cfc83470e8198c2e2bbe0207160a9276aeaa4486.
Merge branch 'master' into desktop