simplenote.vim and surround.vim upgrades