Add jproperties to setup-vim-bundles. Add grab-pigvisualizer-plugin.
Fix merge conflict.