add pathogen, vimwiki
Merge branch 'master' of 192.168.0.4:~/src/sysconf
solve conflict