--- a/.vimrc	Sun Dec 21 20:23:40 2014 +0800
+++ b/.vimrc	Sun Jan 25 18:40:52 2015 +0800
@@ -15,26 +15,35 @@
 set wildignore+=*.pyc
 set wildmode=list:longest
 set autoread
-set pastetoggle=<F2>
 
-set ssop-=options " do not store global and local values in a session
-set ssop-=folds   " do not store folds
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase
 
-set nowrap " don't automatically wrap on load
-set tw=79  " width of document (used by gd)
-set fo-=t  " don't automatically wrap text when typing
-set number " show line numbers
+set sessionoptions-=options " do not store global and local values in a session
+set sessionoptions-=folds   " do not store folds
 
-set tabstop=4
+set nowrap           " don't automatically wrap on load
+set textwidth=79     " width of document (used by gd)
+set formatoptions-=t " don't automatically wrap text when typing
+
+set tabstop=8
 set softtabstop=4
 set shiftwidth=4
 set shiftround
 set expandtab
 
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
+set number        " show line numbers
+set laststatus=2  " always show status line
+set ttimeoutlen=0 " eliminate delay after <ESC>
+
+set t_Co=256
+set background=dark
+set colorcolumn=80
+highlight ColorColumn ctermbg=233
+
+set pastetoggle=<F2>
 
 let mapleader=","
 
@@ -56,10 +65,6 @@
 syntax on
 filetype plugin indent on
 
-" powerline
-set laststatus=2
-set ttimeoutlen=0 " eliminate delay after <ESC>
-
 " ctrlp
 let g:ctrlp_max_height=30
 let g:ctrlp_custom_ignore='\v[\/]venv$'