Merged modifications from remote dotfiles. Added vimrc_functions file.