improved vim setup 

2 commit names because I had to git reset