Switch to vim-commentary and some new aliases