diff --git a/home/.gitconfig b/home/.gitconfig
index 8ca8cf6e..1d4e929b 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -70,4 +70,8 @@
   pushInsteadOf = "git://gist.github.com/"
 
 [mergetool]
-	keepBackup = true
+	keepBackup = false
+[init]
+	templatedir = ~/.git_template
+[ghi]
+	token = !security find-internet-password -a paulmillr -s github.com -l 'ghi token' -w
diff --git a/sublime/Packages/User/Preferences.sublime-settings b/sublime/Packages/User/Preferences.sublime-settings
index cdb7338c..02ae92dd 100644
--- a/sublime/Packages/User/Preferences.sublime-settings
+++ b/sublime/Packages/User/Preferences.sublime-settings
@@ -16,8 +16,8 @@
 		"tmp",
 		"node_modules"
 	],
-	"font_face": "Input Mono",
-	"font_size": 12,
+	"font_face": "Source Code Pro",
+	"font_size": 13,
 	"highlight_line": false,
 	"highlight_modified_tabs": true,
 	"ignored_packages":