Added NeoComplete, remover YouCompleteMe, re-organized .vimrc in a major way.
Merged vimrc conflicts.