gitconfig: merge summary
vimrc: add vim-addon-manager
Merge pull request #1 from darylyu/test_merge

Test merge