fixes in scripts
merge
merge
using Michael's vimrc
vim changes
rule changed