diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim
deleted file mode 100644
index 183ef4b..0000000
--- a/.vim/ftplugin/python.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-set tabstop=8
-set expandtab
-set shiftwidth=4
-set softtabstop=4
diff --git a/.vimrc b/.vimrc
index 283447d..43aa335 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,13 +4,44 @@ filetype off
 " Install Vundle:
 " $ git clone https://github.com/VundleVim/Vundle.vim.git \
 " ~/.vim/bundle/Vundle.vim
+"
+" Install all plugins:
+" $ vim +PluginInstall +qall
+
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
+Plugin 'bling/vim-airline'
 call vundle#end()
 
-syntax on
-colorscheme molokai
-filetype plugin indent on
+
+syntax on           " Enable syntax highlighting.
+colorscheme molokai " Select the theme.
+
+
+filetype plugin indent on " Load the plugin and indent file depending on the file type.
+set expandtab             " Use spaces instead of tabs.
+set tabstop=8             " Number of spaces that a <Tab> in the file counts for.
+set softtabstop=4         " Number of spaces that a <Tab> counts for while performing editing operations.
+set shiftwidth=4          " Number of spaces to use for each step of (auto)indent.
+
+
+set laststatus=2 " Always display the status line.
+set number       " Show line numbers.
+set cursorline   " Highlight current line
+set wildmenu     " Visual autocomplete for command menu
+set lazyredraw   " Redraw only when we need to.
+set showmatch    " Highlight matching [{()}]
+
+
+set incsearch  " Search as characters are entered.
+set hlsearch   " Highlight matches.
+" Turn off search highlight with <leader><space>.
+nnoremap <leader><space> :nohlsearch<CR>
+
+
+" Move vertically by visual line.
+nnoremap j gj
+nnoremap k gk