updates for new vim stuff

Author: binarymatt

.gitmodules

@@ -67,3 +67,6 @@
 [submodule "vimfolder/bundle/jedi-vim"]
 	path = vimfolder/bundle/jedi-vim
 	url = https://github.com/davidhalter/jedi-vim.git
+[submodule "vimfolder/bundle/rust.vim"]
+	path = vimfolder/bundle/rust.vim
+	url = git://github.com/wting/rust.vim.git

ackrc

@@ -5,3 +5,4 @@
 --type-set=less=.less
 --type-set=rst=.rst
 --type-set=yaml=.sls
+--ignore-dir=migrations

bashrc

@@ -1,5 +1,5 @@
 export CLICOLOR=1
-export LSCOLORS=ExFxCxDxBxegedabagacad
+#export LSCOLORS=ExFxCxDxBxegedabagacad
 export TERM=xterm-color 
 export GREP_OPTIONS='--color=auto' GREP_COLOR='1;32'
 

gitconfig

@@ -0,0 +1,16 @@
+[core]
+	editor = vim -f
+[user]
+	name = Matt George
+	email = [email protected]
+[diff]
+	tool = vimdiff
+	tool = vim
+    algorithm = patience
+[difftool]
+	prompt = false
+[alias]
+	co = checkout
+	d = difftool
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
+	undo = reset --soft HEAD^