Merge branch 'master' of http://github.com/wreed4/vimrc

not sure what I'm merging...

.vimrc

@@ -1,6 +1,7 @@
 " wreed vimrc
 " vim: set foldmethod=marker:
 
+"enable python
 python << end
 import vim
 end
@@ -66,7 +67,7 @@ Plugin 'a.vim'
 Plugin 'elzr/vim-json'
 " Diff directories quickly and powerfully
 Plugin 'DirDiff.vim'
-
+" Enable nested vimrc files
 Plugin 'wreed4/vim-lvimrc'
 
 " end installed plugins