diff --git a/bashrc b/bashrc
index 32ef097e42ce2be1124b6f8ad35be9fc31024aa9..7718f3ded94cd26c5ff0d87930a8aa979890476b 100644
--- a/bashrc
+++ b/bashrc
@@ -95,9 +95,9 @@ fi
 #fi
 
 # Enable local bashrc files to overwrite this file
-#if [ -f ~/.bashrc.local ]; then
-#    . ~/.bashrc.local
-#fi
+if [ -f ~/.bashrc.local ]; then
+    . ~/.bashrc.local
+fi
 
 # Enable Git auto completion
 if [ -f ~/git-completion.bash ]; then
diff --git a/vimrc b/vimrc
index e462d76edf0e4d1301753bed172c3e3916367782..ed7004cf6cd5fd6f0e19462d25913eecebe144bc 100644
--- a/vimrc
+++ b/vimrc
@@ -19,7 +19,8 @@ set formatoptions+=ro   " Automatically insert the comment character when you
 
 " Tab options
 set expandtab           " Soft tabs, changes tabs to spaces
-set softtabstop=4       " Number of spaces in a tab
+set tabstop=4           " Number of spaces in a tab
+set softtabstop=4       " Number of spaces in a soft tab
 set shiftwidth=4        " Number of spaces in an indentation level.
 
 
@@ -56,6 +57,7 @@ autocmd BufEnter * let &titlestring = expand("%:t") . " - %{$USER}@" . hostname(
 
 
 " Filetype specific indentation
-filetype plugin indent on
-autocmd FileType html setlocal shiftwidth=2 softtabstop=2   " HTML
+"filetype plugin indent on
+"autocmd FileType html setlocal shiftwidth=2 softtabstop=2   " HTML
+"autocmd FileType php setlocal shiftwidth=4 softtabstop=4    " PHP