Fixed PATH
Cleanup and re-organize plugins and more vimrc tweaks