Modified paths to be included in expected order.
Added user-local homebrew path.
Removed vimdiff. It is terribad.
Modified lazy wrapper to be sourced in one line.