diff --git a/configs/vimrc b/configs/vimrc
index f6e76db..aa3b213 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -3,6 +3,8 @@
 "  have all the cool things enabled
 " ----------------------------------------------------------------------
 
+set encoding=utf-8
+
 " Use Vim settings, rather then Vi settings (much better!).
 " This must be first, because it changes other options as a side effect.
 set nocompatible
@@ -53,6 +55,17 @@ if has("autocmd")
 
   " Python files should not have empty lines
   autocmd FileType python autocmd BufWritePre <buffer> :%s/\s\+$//e
+
+
+  " omni completion
+  au FileType python set ofu=pythoncomplete#Complete
+  au FileType javascript set ofu=javascriptcomplete#CompleteJS
+  au FileType html set ofu=htmlcomplete#CompleteTags
+  au FileType css set ofu=csscomplete#CompleteCSS
+  au FileType xml set ofu=xmlcomplete#CompleteTags
+  au FileType php set ofu=phpcomplete#CompletePHP
+
+  set completeopt-=preview
 else
   set autoindent                " always set autoindenting on
 endif " has("autocmd")
@@ -85,6 +98,8 @@ set wim=longest,list  " file auto-completion
 set t_Co=256			" 256 color terminals
 color busybee			" color for terminals (gvimrc sets the UI color)
 
+syntax sync minlines=500	" increases the number of lines to find the proper syntax
+
 let mapleader=","     " use comma to start user-defined (in plugins) functions
 
 " ----------------------------------------------------------------------
@@ -121,6 +136,9 @@ au FileType mail setlocal spell spelllang=en
 " HTML templates do not need breaks
 au FileType htmldjango set textwidth=0
 
+" JavaScript (who though those were "good" defaults?)
+au FileType javascript set expandtab tabstop=2 sw=2 sts=2 textwidth=0
+
 
 " ----------------------------------------------------------------------
 " mapings
@@ -183,30 +201,45 @@ call vundle#rc()
 " ----------------------------------------------------------------------
 "  Bundles
 " ----------------------------------------------------------------------
+" Vundle itself!
+Bundle 'gmarik/vundle'
+
 " status line
-Bundle "Lokaltog/powerline"
+" Bundle "Lokaltog/powerline"
+Bundle "bling/vim-airline"
+
 " git support
 Bundle 'tpope/vim-fugitive'
+
 " comment code with keys
 Bundle 'tpope/vim-commentary'
+
 " align things
 Bundle 'godlygeek/tabular'
+
 " close pairs
-" Bundle 'jiangmiao/auto-pairs'
-" close pairs
-Bundle 'Townk/vim-autoclose'
-" python flake8 support (with F7)
+Bundle 'jiangmiao/auto-pairs'
+" Bundle 'Townk/vim-autoclose'
+
+" python 
 Bundle 'nvie/vim-flake8'
+" Bundle 'klen/python-mode'
+Bundle 'scrooloose/syntastic'
+
 " snippets
 Bundle 'msanders/snipmate.vim'
+
 " fuzzy file open
 Bundle 'kien/ctrlp.vim'
+
 " select multiple strings at the same time
 Bundle 'terryma/vim-multiple-cursors'
+
 " colorscheme
 Bundle 'croaker/mustang-vim'
-" python support (errors, refactor, etc)
-Bundle 'klen/python-mode'
+
+" Autocomplete
+" Bundle 'ervandew/supertab'
 
 " auto-pair settings
 let g:AutoPairsMapCR = 1
@@ -267,7 +300,17 @@ set tabline=%!PowerTabLine()
 " Powerline settings
 " ----------------------------------------------------------------------
 
-python from powerline.vim import setup as powerline_setup
-python powerline_setup()
-python del powerline_setup
-let g:Powerline_symbols = 'fancy'
+" python from powerline.vim import setup as powerline_setup
+" python powerline_setup()
+" python del powerline_setup
+" let g:Powerline_symbols = 'unicode'
+
+" ----------------------------------------------------------------------
+"  Airline configuration (currently disabled)
+" ----------------------------------------------------------------------
+let g:airline_powerline_fonts = 1
+" let g:airline_theme = 'solarized'
+let g:airline_theme = 'powerlineish'
+let g:airline_detect_whitespace=0 "disabled
+let g:airline_enable_branch = 1
+let g:airline_enable_syntastic = 1