Added augroup
Modified statements related by neobundle