Tweaked some stuff

.gitconfig

@@ -6,9 +6,15 @@
 	status = auto
 	branch = auto
 [diff]
-	tool = kdiff3
+	tool = p4merge
 [merge]
-	tool = kdiff3
+	tool = p4merge
+[difftool "p4merge"]
+	cmd = "p4merge.exe $LOCAL $REMOTE"
+[mergetool "p4merge"]
+	cmd = "p4merge $BASE $LOCAL $REMOTE $MERGED"
+	trustExitCode = true
+	keepBackup = false
 [difftool "kdiff3"]
 	path = kdiff3.exe
 	keepBackup = false
@@ -29,3 +35,5 @@
 	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
 	type = cat-file -t
 	dump = cat-file -p
+[push]
+	default = upstream

.gitmodules

@@ -1,9 +1,15 @@
 [submodule ".vim/bundle/vim-ps1"]
 	path = .vim/bundle/vim-ps1
 	url = git@github.com:PProvost/vim-ps1.git
+	ignore = dirty
+[submodule ".vim/bundle/fugitive"]
+	path = .vim/bundle/fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+	ignore = dirty
 [submodule ".vim/bundle/vim-powerline"]
 	path = .vim/bundle/vim-powerline
 	url = https://github.com/Lokaltog/vim-powerline.git
+	ignore = dirty
 [submodule "powershell/modules/posh-git"]
 	path = powershell/modules/posh-git
 	url = https://github.com/dahlbyk/posh-git.git
@@ -13,12 +19,14 @@
 [submodule "powershell/modules/posh-svn"]
 	path = powershell/modules/posh-svn
 	url = git@github.com:PProvost/posh-svn.git
+	ignore = dirty
 [submodule "powershell/modules/PowerTab"]
 	path = powershell/modules/PowerTab
 	url = git@github.com:PProvost/PowerTab.git
 [submodule ".vim/bundle/vim-colors-solarized"]
 	path = .vim/bundle/vim-colors-solarized
 	url = git://github.com/altercation/vim-colors-solarized.git
+	ignore = dirty
 [submodule ".vim/bundle/sharp-indent"]
 	path = .vim/bundle/sharp-indent
 	url = git://github.com/PProvost/sharp-Indent.git

.vimrc

@@ -18,9 +18,6 @@ call pathogen#runtime_append_all_bundles()
 call pathogen#helptags()
 
 " appearance options
-let g:zenburn_high_Contrast = 1
-let g:liquidcarbon_high_contrast = 1
-let g:molokai_original = 1
 let g:Powerline_cache_file = expand('$TMP/Powerline.cache')
 
 if has("gui_running")