Change vimrc and update amino

home/vim/vim-amino

@@ -1 +1 @@
-Subproject commit e662f56e98b20e0c9b9500380cf136d9044e76b4
+Subproject commit 762bf2850585474aab531810a9bc306607bb5272

home/vimrc

@@ -1,56 +1,7 @@
 set nocompatible " Do not use the old vi
 set encoding=utf-8
 
-if isdirectory(expand('~/.vim/bundle/Vundle.vim'))
-
-	"
-	" Vundle must be loaded with the following
-	" git clone https://github.com/VundleVim/Vundle.vim.git
-	"           ~/.vim/bundle/Vundle.vim
-	" Then use :PluginInstall to load the plugins.
-	" In addition, YouCompleteMe needs to be compiled with
-	" python ~/.vim/bundle/YouCompleteMe/install.py --clang-completer
-	" Other plugins needs to be compiled to.
-	"
-	"
-	" Loads Vundle. See Vundle documentation for details
-	"
-	filetype off " Turned back on later
-	set rtp+=~/.vim/bundle/Vundle.vim
-	call vundle#begin()
-	
-	" Plugin loading area
-	Plugin 'VundleVim/Vundle.vim'
-	
-	Plugin 'scrooloose/nerdtree'
-	Plugin 'vim-airline/vim-airline'
-	Plugin 'vim-airline/vim-airline-themes'
-	Plugin 'tpope/vim-fugitive'
-	Plugin 'dag/vim-fish'
-	Plugin 'lervag/vimtex'
-	Plugin 'davidhalter/jedi-vim'
-
-	" Web
-	Plugin 'yuezk/vim-js'
-	Plugin 'othree/javascript-libraries-syntax.vim'
-	Plugin 'maxmellon/vim-jsx-pretty'
-	Plugin 'leafgarland/typescript-vim'
-	Plugin 'Quramy/tsuquyomi'
-	Plugin 'scrooloose/syntastic.git'
-	Plugin 'burnettk/vim-angular'
-	
-	" C-like
-	Plugin 'Valloric/YouCompleteMe'
-	Plugin 'jeaye/color_coded'
-	Plugin 'rdnetto/YCM-Generator'
-	Plugin 'Stochastica/formatGen'
-	
-	call vundle#end()
-	filetype plugin indent on
-
-endif
-
-" Requires Liberation Mono Powerline. See github.com/powerline/fonts
+" Requires powerline fonts to be installed from github.com/powerline/fonts
 if has('gui_running')
 	if has("gui_macvim")
 		set guifont=MesloLGSDZForPowerline-Regular:h14
@@ -126,6 +77,55 @@ set conceallevel=1
 vnoremap . :norm.<CR>
 
 syntax enable
+colorscheme amino
+
+if isdirectory(expand('~/.vim/bundle/Vundle.vim'))
+
+	"
+	" Vundle must be loaded with the following
+	" git clone https://github.com/VundleVim/Vundle.vim.git
+	"           ~/.vim/bundle/Vundle.vim
+	" Then use :PluginInstall to load the plugins.
+	" In addition, YouCompleteMe needs to be compiled with
+	" python ~/.vim/bundle/YouCompleteMe/install.py --clang-completer
+	" Other plugins needs to be compiled to.
+	"
+	"
+	" Loads Vundle. See Vundle documentation for details
+	"
+	filetype off " Turned back on later
+	set rtp+=~/.vim/bundle/Vundle.vim
+	call vundle#begin()
+	
+	" Plugin loading area
+	Plugin 'VundleVim/Vundle.vim'
+	
+	Plugin 'scrooloose/nerdtree'
+	Plugin 'vim-airline/vim-airline'
+	Plugin 'vim-airline/vim-airline-themes'
+	Plugin 'tpope/vim-fugitive'
+	Plugin 'dag/vim-fish'
+	Plugin 'lervag/vimtex'
+	Plugin 'davidhalter/jedi-vim'
+
+	" Web
+	Plugin 'yuezk/vim-js'
+	Plugin 'othree/javascript-libraries-syntax.vim'
+	Plugin 'maxmellon/vim-jsx-pretty'
+	Plugin 'leafgarland/typescript-vim'
+	Plugin 'Quramy/tsuquyomi'
+	Plugin 'scrooloose/syntastic.git'
+	Plugin 'burnettk/vim-angular'
+	
+	" C-like
+	Plugin 'Valloric/YouCompleteMe'
+	Plugin 'jeaye/color_coded'
+	Plugin 'rdnetto/YCM-Generator'
+	Plugin 'Stochastica/formatGen'
+	
+	call vundle#end()
+	filetype plugin indent on
+
 	let g:ycm_autoclose_preview_window_after_completion = 1
 	let g:ycm_autoclose_preview_window_after_insertion = 1
 	"let g:ycm_server_python_interpreter="/usr/bin/python3"
@@ -156,5 +156,6 @@ let g:ConqueTerm_StartMessages = 0 " Display warning messages if Conque is confi
 	let g:airline_powerline_fonts = 1
 	let g:airline#extensions#whitespace#enabled = 0
 	
-colorscheme amino
 	let g:airline_theme='bubblegum'
+
+endif