Clean up Vimrc, move vundler setup back to vimrc