Add option for vimdiff
Remove ctrlp/fugitive/powerline