Merge 040d782aa8 into 5f6aa8fe09

.gitignore

@@ -3,6 +3,8 @@ sources_non_forked/ack.vim/.netrwhist
 temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
+sources_non_forked/LaTeX-Box
+sources_non_forked/vim-rails
 my_configs.vim
 tags
 .DS_Store

my_configs.vim

@@ -0,0 +1,26 @@
+" Basic formatting settings
+set listchars=tab:»·,trail:·
+set list
+" Turn on line numbering
+set number
+syntax on
+colorscheme monokai
+
+" Enable folding
+set foldmethod=indent
+set foldlevel=99
+
+" Adds proper PEP-8 settings for Python files
+au BufNewFile,BufRead *.py
+    \ set tabstop=4
+    \ set softtabstop=4
+    \ set shiftwidth=4
+    \ set textwidth=79
+    \ set expandtab
+    \ set autoindent
+    \ set fileformat=unix
+
+au BufNewFile,BufRead *.js, *.html, *.css
+    \ set tabstop=2
+    \ set softtabstop=2
+    \ set shiftwidth=2

my_configs.vim.orig

@@ -0,0 +1,35 @@
+<<<<<<< 3667b54b19b952b13d638536b5f47e226d252e30
+" Basic formatting settings
+set listchars=tab:»·,trail:·
+set list
+" Turn on line numbering
+set number
+syntax on
+colorscheme monokai
+
+" Enable folding
+set foldmethod=indent
+set foldlevel=99
+
+" Adds proper PEP-8 settings for Python files
+au BufNewFile,BufRead *.py
+    \ set tabstop=4
+    \ set softtabstop=4
+    \ set shiftwidth=4
+    \ set textwidth=79
+    \ set expandtab
+    \ set autoindent
+    \ set fileformat=unix
+
+au BufNewFile,BufRead *.js, *.html, *.css
+    \ set tabstop=2
+    \ set softtabstop=2
+    \ set shiftwidth=2
+||||||| merged common ancestors
+=======
+set listchars=tab:»·,trail:·
+set list
+set number
+syntax on
+colorscheme monokai
+>>>>>>> -added personal git configuration file

sources_non_forked/LaTeX-Box

@@ -0,0 +1 @@
+Subproject commit 3c2901e12cb78bfb2be58ba4c62a488612550fe1

sources_non_forked/vim-rails

@@ -0,0 +1 @@
+Subproject commit fc5d7792afbebc7bef8de1e3a00713bba2932a24