Fix install and update scripts
Merge vimrc from working env