Moved private info into env variables, cleanup

gitconfig

@@ -1,3 +1,10 @@
+# set these tokens up in your env, such as ~/.secrets
+[github]
+  user = $GITHUB_USER
+  token = $GITHUB_TOKEN 
+[user]
+  name = $GIT_USER
+  email = $GIT_EMAIL
 [color]
   ui = true
 [color "branch"]
@@ -82,18 +89,6 @@
   editor = /usr/bin/vim
   excludesfile = ~/.dotfiles/gitignore_global
 
-[merge]
-  tool = threesome
-
-[mergetool "threesome"]
-  cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
-  trustExitCode = true
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
 [advice]
   statusHints = false
 [diff]