diff --git a/.gitignore b/.gitignore
index e43b0f9..aa82804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.netrwhist
diff --git a/.gitmodules b/.gitmodules
index dc9f9d1..9b7f90d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,12 +4,6 @@
 [submodule "bundle/command-t"]
 	path = bundle/command-t
 	url = git://git.wincent.com/command-t.git
-[submodule "bundle/endwise"]
-	path = bundle/endwise
-	url = https://github.com/tpope/vim-endwise.git
-[submodule "bundle/ragtag"]
-	path = bundle/ragtag
-	url = https://github.com/tpope/vim-ragtag.git
 [submodule "bundle/rails"]
 	path = bundle/rails
 	url = https://github.com/tpope/vim-rails.git
@@ -28,15 +22,6 @@
 [submodule "bundle/markdown"]
 	path = bundle/markdown
 	url = https://github.com/plasticboy/vim-markdown.git
-[submodule "bundle/rooter"]
-	path = bundle/rooter
-	url = https://github.com/airblade/vim-rooter.git
-[submodule "bundle/tagbar"]
-	path = bundle/tagbar
-	url = git://github.com/majutsushi/tagbar.git
-[submodule "bundle/delmitmate"]
-	path = bundle/delmitmate
-	url = git://github.com/Raimondi/delimitMate.git
 [submodule "bundle/snipmate"]
 	path = bundle/snipmate
 	url = git://github.com/msanders/snipmate.vim.git
diff --git a/bundle/delmitmate b/bundle/delmitmate
deleted file mode 160000
index 39b8298..0000000
--- a/bundle/delmitmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39b8298390a9171c796df077ad3c5f3c0f111c56
diff --git a/bundle/endwise b/bundle/endwise
deleted file mode 160000
index 86e1d4a..0000000
--- a/bundle/endwise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 86e1d4ab9192245ae83831f073c0452f3b7baba8
diff --git a/bundle/ragtag b/bundle/ragtag
deleted file mode 160000
index bdc8b58..0000000
--- a/bundle/ragtag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdc8b580b5b583aeb43efb19aac2ab8ce5566dff
diff --git a/bundle/tagbar b/bundle/tagbar
deleted file mode 160000
index 3c07565..0000000
--- a/bundle/tagbar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c075654d424c6e3c20521bd4567b517a2410593
diff --git a/colors/murphy2.vim b/colors/murphy2.vim
new file mode 100644
index 0000000..6e24a20
--- /dev/null
+++ b/colors/murphy2.vim
@@ -0,0 +1,41 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2003 May 02
+
+hi clear
+set background=dark
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "murphy2"
+
+hi Normal		ctermbg=None  ctermfg=lightgreen guibg=Black		 guifg=lightgreen
+hi Comment		term=bold	   ctermfg=LightRed   guifg=Orange
+hi Constant		term=underline ctermfg=LightGreen guifg=White	gui=NONE
+hi Identifier	term=underline ctermfg=LightCyan  guifg=#00ffff
+hi Ignore					   ctermfg=black	  guifg=bg
+hi PreProc		term=underline ctermfg=LightBlue  guifg=Wheat
+hi Search		term=reverse					  guifg=white	guibg=Blue
+hi Special		term=bold	   ctermfg=LightRed   guifg=magenta
+hi Statement	term=bold	   ctermfg=Yellow	  guifg=#ffff00 gui=NONE
+hi Type						   ctermfg=LightGreen guifg=grey	gui=none
+hi Error		term=reverse   ctermbg=Red	  ctermfg=White guibg=Red  guifg=White
+hi Todo			term=standout  ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
+" From the source:
+hi Cursor										  guifg=Orchid	guibg=fg
+hi Directory	term=bold	   ctermfg=LightCyan  guifg=Cyan
+hi ErrorMsg		term=standout  ctermbg=DarkRed	  ctermfg=White guibg=Red guifg=White
+hi IncSearch	term=reverse   cterm=reverse	  gui=reverse
+hi LineNr		term=underline ctermfg=Yellow					guifg=Yellow
+hi ModeMsg		term=bold	   cterm=bold		  gui=bold
+hi MoreMsg		term=bold	   ctermfg=LightGreen gui=bold		guifg=SeaGreen
+hi NonText		term=bold	   ctermfg=Blue		  gui=bold		guifg=Blue
+hi Question		term=standout  ctermfg=LightGreen gui=bold		guifg=Cyan
+hi SpecialKey	term=bold	   ctermfg=LightBlue  guifg=Cyan
+hi StatusLine	term=reverse,bold cterm=reverse   gui=NONE		guifg=White guibg=darkblue
+hi StatusLineNC term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=#333333
+hi Title		term=bold	   ctermfg=LightMagenta gui=bold	guifg=Pink
+hi WarningMsg	term=standout  ctermfg=LightRed   guifg=Red
+hi Visual		term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=darkgreen
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
index 9677421..478cc50 100644
--- a/ftplugin/python.vim
+++ b/ftplugin/python.vim
@@ -1,3 +1,4 @@
 setlocal sw=4
 setlocal ts=4
 noremap <buffer> <LocalLeader>py o/**************<CR><CR>/<Esc>
+let python_space_errors = 1
diff --git a/vimrc b/vimrc
index cd564fd..21117bd 100644
--- a/vimrc
+++ b/vimrc
@@ -23,7 +23,9 @@ set ignorecase                    " Case-insensitive searching.
 set smartcase                     " But case-sensitive if expression contains a capital letter.
 
 set number                        " Show line numbers.
+set nuw=3
 set ruler                         " Show cursor position.
+set autoindent
 
 set incsearch                     " Highlight matches as you type.
 set hlsearch                      " Highlight matches.
@@ -42,14 +44,13 @@ set directory=$HOME/.vim/tmp//,.  " Keep swap files in one location
 " UNCOMMENT TO USE
 set tabstop=2                    " Global tab width.
 set shiftwidth=2                 " And again, related.
-"set expandtab                    " Use spaces instead of tabs
+set expandtab                    " Use spaces instead of tabs
 
 set laststatus=2                  " Show the status line all the time
 " Useful status information at bottom of screen
 set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %{fugitive#statusline()}%{exists('*CapsLockStatusline')?CapsLockStatusline():''}%=%-16(\ %l,%c-%v\ %)%P
 
-" Or use vividchalk
-colorscheme vividchalk
+colorscheme murphy2
 
 " Tab mappings.
 map <leader>tt :tabnew<cr>
@@ -81,7 +82,9 @@ nnoremap : ;
 vnoremap ; :
 vnoremap : ;
 
-set pastetoggle=<F2>
+map <F2> :mksession! ~/.vim/session <cr>
+map <F3> :source ~/.vim/session <cr>
+
 " Automatic fold settings for specific files. Uncomment to use.
 " autocmd FileType ruby setlocal foldmethod=syntax
 " autocmd FileType css  setlocal foldmethod=indent shiftwidth=2 tabstop=2