diff --git a/.gitconfig b/.gitconfig
index ad0f0b1..746419b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,9 @@
 [diff]  
   renamelimit = 0
 
+[merge]
+  conflictstyle = diff3
+
 [color] 
   diff = auto
   interactive = auto
@@ -36,5 +39,6 @@
 	default = current
 [rerere]
 	enabled = true
+
 [url "git@github.com:"]
 	insteadOf = https://github.com/
diff --git a/.vimrc b/.vimrc
index 5990542..dbfbd20 100644
--- a/.vimrc
+++ b/.vimrc
@@ -70,6 +70,16 @@ set t_Sb=ESC[4%dm
 let $RUST_SRC_PATH="/usr/src/rust/src/"
 
 "let g:ft_ignore_pat = '.org'
+"
+
+if exists('veonim')
+  let g:vscode_extensions = [
+        \'ms-python.python',
+        \'ms-vscode.go',
+        \]
+  set guifont=Droid\ Sans\ Mono\ Dotted:h20
+" set linespace=10
+endif
 
 " Required:
 set runtimepath+=/home/bmichener/.vim/bundle/repos/github.com/Shougo/dein.vim
@@ -420,6 +430,9 @@ endif
 " CD to the path of the file I'm editing.
 command Cdf :cd %:p:h
 
+" Print path of file
+command Filepath :echo expand('%:p')
+
 " Save a vim session! Useful if you want to save buffer states and so on
 command SaveSession :mksession! ~/.vim_last_session
 command LoadSession :source ~/.vim_last_session