Added special .vimrc from Coming Home to Vim blog.
Fixed merge issue in .vimrc