Vim: Reorganize vimrc, add PHP/HTML syntax

.vimrc

@@ -54,22 +54,26 @@ set splitright
 set modeline
 set modelines=5
 
-" Session saving
-map <F2> :mksession! ~/.vim_session <cr> " Quick write session with F2
-map <F3> :source ~/.vim_session <cr>     " And load session with F3
-
 " Use XA_PRIMARY clipboard by default
 set clipboard=unnamedplus
 
-" Python stuff
+" Python
 au BufNewFile,BufRead *.py " Set up nice PEP8 indentation
-			\ set tabstop=4 |
-			\ set softtabstop=4 |
-			\ set shiftwidth=4 |
-			\ set textwidth=79 |
-			\ set expandtab |
-			\ set autoindent |
-			\ set fileformat=unix
+	\ set tabstop=4 |
+	\ set softtabstop=4 |
+	\ set shiftwidth=4 |
+	\ set textwidth=79 |
+	\ set expandtab |
+	\ set autoindent |
+	\ set fileformat=unix
+" HTML
+au BufNewFile,BufRead *.html,*.php
+	\ set tabstop=2 |
+	\ set softtabstop=2 |
+	\ set shiftwidth=2
+" Treat PHP like HTML
+au BufNewFile,BufRead *.php
+	\ set filetype=html
 
 " Miscellaneous options
 set incsearch " Search while you type
@@ -77,10 +81,6 @@ set number relativenumber " Relative line numbering
 set encoding=utf-8
 set laststatus=2 " Always show statusbar
 
-" For clang_complete
-" Proper path for Debian Buster
-let g:clang_library_path='/usr/lib/llvm-4.0/lib/libclang.so.1'
-
 " Enable 256-color support
 " All of my machines support 256-color so this should be fine
 set t_Co=256