Latest updates
Fixed merge for vimrc