Add .vimrc.after
Merge remote-tracking branch 'origin/master'