Update vimrc to current settings.
Reorder gitconfig

Place user information at the top.
Move .gitk into repository.