Merge remote-tracking branch 'origin/master'
NeoSnippetの設定
powerlineの設定
neocomplcache -> neocomplete