Updating from local copy
merging latest vimrc changes