Made major improvements and formatted vimrc

vimrc

@@ -9,7 +9,7 @@ au VimResized * exe "normal! \<c-w>="
 "match Error /\s\+$/
 "nnoremap s xa
 "nnoremap <F5> :UndotreeToggle<CR>
-inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>"
+inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
 imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
 smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" 
 nnoremap <C-w>\| <C-w>v<C-w>l
@@ -103,14 +103,25 @@ inoremap <C-h> <Left>
 inoremap <C-k> <Up>
 inoremap <C-j> <Down>
 nnoremap Y y$
+nnoremap <Up> <C-w>w
+nnoremap <Down> <C-w>W
+nnoremap <Left> :bp<CR>
+nnoremap <Right> :bn<CR>
+nnoremap <C-w>z <C-w>_<C-w>|
+nmap <C-Up> [e
+nmap <C-Down> ]e
+vmap <C-Up> [egv
+vmap <C-Down> ]egv
 set guicursor+=n-v-c:blinkon0
 set formatoptions-=r
 set formatoptions-=o
 set diffopt+=iwhite
 set noesckeys
 set mouse-=a
-set expandtab
 set shiftwidth=2
+set tabstop=2
+set softtabstop=2
+set expandtab
 set history=1000
 set hidden
 set cursorline
@@ -127,6 +138,19 @@ set undolevels=1000
 set history=200
 set ttyfast
 set ff=unix
+set encoding=utf-8
+set laststatus=2
+set foldmethod=marker
+set foldnestmax=10
+set foldlevel=2
+set rnu
+set nu
+set ts=2 sw=2 et
+set background=dark
+set t_Co=256
+set gdefault
+set nocompatible
+set rtp+=~/.vim/bundle/vundle/
 syntax on
 let g:airline_left_sep='▶'
 let g:airline_right_sep='◀'
@@ -141,20 +165,9 @@ let g:syntastic_java_javac_classpath = "/Applications/Android Studio.app/sdk/pla
 " -xn -xc -xl -S
 "let g:airline#extensions#tabline#enabled=1
 let g:Powerline_symbols = 'fancy'
-set encoding=utf-8
-set laststatus=2
-set foldmethod=marker
-set foldnestmax=10
-set foldlevel=2
-set rnu
-set nu
-set ts=2 sw=2 et
 let g:indent_guides_start_level=2
 let g:indent_guides_guide_size=1
 let g:indent_guides_enable_on_vim_startup=1
-set background=dark
-set t_Co=256
-set gdefault
 let g:neocomplcache_enable_at_startup=1
 let g:neocomplcache_enable_camel_case_completion=1
 let g:neocomplcache_enable_smart_case=1
@@ -163,14 +176,11 @@ let g:neocomplcache_enable_auto_delimiter=1
 let g:neocomplcache_max_list=20
 let g:neocomplcache_force_overwrite_completefunc=1
 let g:neocomplcache_min_syntax_length = 2
-
 let g:php_refactor_command='php /usr/local/bin/refactor.phar'
 "inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
 "let g:neocomplcache_enable_auto_select = 1
 let loaded_matchit = 1
-set nocompatible              " be iMproved
-filetype off                  " required!
-set rtp+=~/.vim/bundle/vundle/
+filetype off
 call vundle#rc()
 Bundle 'gmarik/vundle'
 Bundle 'Chiel92/vim-autoformat'
@@ -199,6 +209,7 @@ Bundle 'tpope/vim-commentary'
 Bundle 'mbbill/undotree'
 Bundle 'vim-php/vim-php-refactoring'
 Bundle 'tpope/vim-fugitive'
+Bundle 'tpope/vim-unimpaired'
 Bundle 'kien/ctrlp.vim'
 Bundle 'godlygeek/tabular'
 "Bundle 'Floobits/floobits-vim'