naiive rewriting
forgot to update neobundle
neocompletelock
Merge branch 'master' into neocomplete
Merge branch 'master' into neocomplete
Merge branch 'master' into neocomplete
Merge branch 'neocomplete'