diff --git a/README.md b/README.md
index 096f131..28a6273 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Lean & mean statusline for vim that's light as air.
 *  integrates with a variety of plugins, including: [vim-bufferline][6], [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [vim-signify][30], [syntastic][5], [lawrencium][21] and [virtualenv][31]
 *  looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
 *  optimized for speed; it loads in under a millisecond.
-*  extensive suite of themes for popular colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants) ,[molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
+*  extensive suite of themes for popular colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
 *  supports 7.2 as the minimum Vim version
 
 # Straightforward customization
@@ -121,7 +121,7 @@ Contributions and pull requests are welcome.  Please take note of the following
 
 # License
 
-MIT license. Copyright (c) 2013 Bailey Ling.
+MIT License. Copyright (c) 2013 Bailey Ling.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
diff --git a/plugin/airline.vim b/plugin/airline.vim
index ca66691..c5aae1e 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -12,6 +12,10 @@ function! s:check_defined(variable, default)
   endif
 endfunction
 
+if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
+  echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
+endif
+
 call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
 call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
 call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
@@ -116,6 +120,10 @@ function! s:airline_toggle()
       autocmd ColorScheme * call <sid>on_colorscheme_changed()
       autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost *
             \ call <sid>on_window_changed()
+
+      autocmd BufWritePost */autoload/airline/themes/*.vim
+            \ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), '\n')[0]
+            \ | call airline#load_theme()
     augroup END
     if s:airline_initialized
       call <sid>on_window_changed()