vim-startify追加
Merge branch 'master' into dev

Conflicts:
  vimrc