Remove buffer from mappings
Add vim-argumentative