Fixed inconsistency with vim-surround. fixes #47 and #26.