Add codic-vim, unite-codic
Merge branch 'master' into linux