Improve NeoBundleLazy snippet
Improve java snippets
Merge remote-tracking branch 'upstream/master'