Moved functions.vim to a plugin, updated vimrc