Merge branch 'master' of github.com:aarongut/dotfiles

.gitconfig

@@ -4,6 +4,6 @@
 [diff]
 	tool = vimdiff
 [difftool]
-	prompt = false
+	prompt = true
 [push]
 	default = simple

.ncmpcpp/config

@@ -166,7 +166,7 @@ playlist_disable_highlight_delay = "3"
 ##
 # 
 song_list_format = "{$2%c$9: $5%C %t$9 {$7(%p)$9}}|{{{{$2%a$9}{ $4%b$9}: }{$5%t$9}}|{$5%f$9}}$R{$3(%l)$9}"
-song_status_format = "{{$2%c$9: $5%C$9 }|{$2%a$9{ $4\"%b\"{ (%y)$9}} - }{$5%t$9}}|{$4%f$9}"
+song_status_format = "{{$2%c$9: $5%C$9 }|{$2%a$9{ $4%b{ (%y)$9}} - }{$5%t$9}}|{$4%f$9}"
 song_library_format = "{%n - }{%t}|{%f}"
 #
 #tag_editor_album_format = "{(%y) }%b"

.vim/ftplugin/tex.vim

@@ -1,2 +1,3 @@
 setlocal spell spelllang=en_us
 setlocal linebreak
+setlocal textwidth=80

.zshrc

@@ -41,6 +41,7 @@ alias ocamldebug='rlwrap ocamldebug'
 alias rm='rm -i'
 alias shell='ps -p $$ -o comm='
 alias sml='rlwrap sml'
+alias sshp='ssh -o PubkeyAuthentication=no'
 alias style='clang-format-3.5 -style=Google'
 alias telnet='rlwrap telnet'
 

install.sh

@@ -4,3 +4,4 @@ git submodule sync;
 git submodule update;
 
 rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE  --no-perms . ~;
+cp ./.gitconfig ~/.gitconfig;