few changes to vimrc, env & path files
Merge remote-tracking branch 'origin/master'