Added surround and repeat
Removed vim-repeat