Cleaning up vimrc and moving old vim code around.