Various ssh updates + stuff

.bashrc

@@ -10,6 +10,7 @@ else
 fi
 
 alias dotfiles='cd; curl -#L https://github.com/atomaka/dotfiles/tarball/master | tar -xzv --strip-components 1 --exclude={README,.gitignore}; source ~/.profile'
+alias npdev='sshfs -o idmap=user -o workaround=rename $USER@netprint:/data/test ~/Source/netprint'
 
 alias gvim='gvim -f &'
 

.gitconfig

@@ -17,7 +17,7 @@
     changed = green
     untracked = cyan
 [merge]
-    tool = sublime
+    tool = vimdiff
 [apply]
     whitespace = fix
 [core]