cleanup, vim-sensible, plugin changes