Vim: misc updates
Bash: fix env variables