Move to tab indenting

.vim/after/ftplugin/html.vim

@@ -1 +0,0 @@
-setlocal tw=0

.vim/after/ftplugin/php.vim

@@ -1,3 +0,0 @@
-setlocal ts=4
-setlocal sts=4
-setlocal sw=4

.vim/after/ftplugin/python.vim

@@ -1,4 +1 @@
 set cinwords=if,elif,else,for,while,try,except,finally,def,class
-setlocal ts=4
-setlocal sts=4
-setlocal sw=4

.vimrc

@@ -5,17 +5,9 @@ call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'bling/vim-airline'
-Plugin 'pangloss/vim-javascript'
-Plugin 'tpope/vim-markdown'
-Plugin 'othree/html5.vim'
-Plugin 'elzr/vim-json'
 Plugin 'hail2u/vim-css3-syntax'
 Plugin 'cakebaker/scss-syntax.vim'
-Plugin 'wting/rust.vim'
-Plugin 'hynek/vim-python-pep8-indent'
-Plugin 'StanAngeloff/php.vim'
 Plugin 'altercation/vim-colors-solarized'
-Plugin 'tpope/vim-fugitive'
 Plugin 'vim-airline/vim-airline-themes'
 call vundle#end()
 
@@ -39,17 +31,16 @@ set ffs=unix
 set ff=unix
 
 " Indentation stuff
-" 2-space everything
 set tabstop=2
 set softtabstop=2
 set shiftwidth=2
-set expandtab
+set noexpandtab
 " Old school
 set textwidth=80
 set colorcolumn=+1
-" Auto wrap long lines
-set formatoptions+=t
+
 set autoindent
+set smartindent
 
 " Look and feel
 set encoding=utf-8