Merge remote branch 'taxilian/master'

Conflicts:
	.gitmodules
	.vim/bundle/piv
	.vimrc

Author: spf13

.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.pyc
+*._*

.gitmodules

@@ -1,6 +1,3 @@
-[submodule ".vim/bundle/piv"]
-	path = .vim/bundle/piv
-	url = git://github.com/spf13/PIV.git
 [submodule ".vim/bundle/snipmate"]
 	path = .vim/bundle/snipmate
 	url = git://github.com/spf13/snipmate.vim.git
@@ -19,9 +16,6 @@
 [submodule ".vim/bundle/supertab"]
 	path = .vim/bundle/supertab
 	url = git://github.com/ervandew/supertab.git
-[submodule ".vim/bundle/nerdtree"]
-	path = .vim/bundle/nerdtree
-	url = http://github.com/spf13/nerdtree.git
 [submodule ".vim/bundle/fugitive"]
 	path = .vim/bundle/fugitive
 	url = http://github.com/tpope/vim-fugitive.git
@@ -43,3 +37,21 @@
 [submodule ".vim/bundle/surround"]
 	path = .vim/bundle/surround
 	url = git://github.com/spf13/vim-surround.git
+[submodule ".vim/bundle/piv"]
+	path = .vim/bundle/piv
+	url = git://github.com/taxilian/PIV.git
+[submodule ".vim/bundle/VimDebugger"]
+	path = .vim/bundle/VimDebugger
+	url = git://github.com/taxilian/VimDebugger.git
+[submodule ".vim/bundle/nerdtree"]
+	path = .vim/bundle/nerdtree
+	url = git://github.com/taxilian/nerdtree.git
+[submodule ".vim/bundle/jslint"]
+	path = .vim/bundle/jslint
+	url = git://github.com/bloveridge/jslint.vim.git
+[submodule ".vim/bundle/pyflakes"]
+	path = .vim/bundle/pyflakes
+	url = git://github.com/bloveridge/pyflakes-vim.git
+[submodule ".vim/bundle/ack"]
+	path = .vim/bundle/ack
+	url = git://github.com/mileszs/ack.vim.git