Use unite and organize vimrc a bit.

http://www.codeography.com/2013/06/17/replacing-all-the-things-with-unite-vim.html
vim: Try out tommcdo/vim-exchange.

And remove my unused (unuseful) swap mapping.