Giving SuperTab another shot
Various vim-r tweaks