Consildate vimrc to single file
Some clean up stuff