update neobundle, minor refactor