Better unite integration
Revert "Better unite integration"

This reverts commit 0ae0d2e9a0174fb48de3b1c59d4c2ca4aa283e64.
Revert "Switch from CtrlP to unite.vim"

This reverts commit 4eff6467edc52836db8871e59b3c1d2479a67493.