NeoBundle周りを整理
Fix conflicts.