Add updates to ctags, vimrc, add instructions to do a git merge with
"theirs"
Add ffind and updater for ffind