diff --git a/.vimrc b/.vimrc
index 3a56695..fb6e0a8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,10 +1,33 @@
 syntax on
+syntax enable
 filetype on
+filetype indent plugin on
+set modeline
+
+" use flake8 to ensure PEP-8 compliance for python
+source /home/oli/.vim/bundle/ftplugin/python_flake8.vim
+let g:flake8_builtins="_,apply"
+autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
+
 set background=dark
 set showcmd
+
+" highlight searches
 set hlsearch
+" case insensitive searches
+set incsearch
+
+" Relative line numbers except the current line
+" Both relativenumber with number works on vim 7.4+
+set relativenumber
+"set number
+
 let g:solarized_termcolors=256
-colorscheme solarized ".vim/colors/solarized.vim 
+colorscheme solarized
+
+" Highlight 80 column
+set colorcolumn=80
+highlight ColorColumn ctermbg=233
 
 " Jump to last position in file when reopening
 if has("autocmd")