Updated vim and scripts