cleanup vimrc
move vimrc for easier editing
move vimrc back, add neocomplete
revert NeoBundle
update vimrc