Cleanup, remove unused and deprecated plugins
vimrc reorg, couple new plugins