vim-sparkup update and .vimrc tweak
resolved merge conflict in .vimrc