diff --git a/.install.conf.yaml b/.install.conf.yaml
index 7c632c4..08bda0f 100644
--- a/.install.conf.yaml
+++ b/.install.conf.yaml
@@ -8,6 +8,7 @@
 - link:
     ~/.bashrc: bash/bashrc
     ~/.bash_profile: bash/profile
+    ~/.config/git/attributes: git/attributes
     ~/.config/git/config: git/config
     ~/.config/git/ignore_global: git/ignore
     ~/.config/geany/keybindings.conf: geany/keybindings.conf
diff --git a/git/attributes b/git/attributes
new file mode 100644
index 0000000..3a225fe
--- /dev/null
+++ b/git/attributes
@@ -0,0 +1,12 @@
+# Automatically normalize line endings for all text-based files
+#* text=auto
+
+# Documents
+*.doc	diff=pandoc
+*.DOC	diff=pandoc
+*.docx	diff=pandoc
+*.DOCX	diff=pandoc
+*.odt	diff=pandoc
+*.ODT	diff=pandoc
+*.pdf	diff=pdf
+*.PDF	diff=pdf
diff --git a/git/config b/git/config
index 0006cbe..5e772ac 100644
--- a/git/config
+++ b/git/config
@@ -8,6 +8,7 @@
 	default = matching
 [core]
 	excludesfile = ~/.config/git/ignore
+	attributesfile = ~/.config/git/attributes
 [color]
 	ui = auto
 [color "status"]
@@ -20,7 +21,7 @@
 [diff]
 	mnemonicPrefix = true
 	tool = vimdiff
-[diff "rst"]
+[diff "pandoc"]
 	textconv = pandoc --to=rst
 [diff "pdf"]
 	textconv = pdf2txt
@@ -31,5 +32,13 @@
 	lg = !"git lg1"
 	lga = !"git lg --all"
 
+	s = status --short
+	st = status
+
+	pushf = push --force-with-lease # Look mom, no --force
+
 	dif = diff
+	diffc = diff --cached
+	difc  = diff --cached
+
 	alias = "! git config --get-regexp ^alias\\. "
diff --git a/vim/vimrc b/vim/vimrc
index fd5864e..48dddb7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,6 +31,7 @@ if has("patch-7.4.710")
 else
 	set listchars=tab:→\ ,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
 endif
+set showbreak=\\
 
 "Folding
 "augroup vimrc
@@ -39,10 +40,15 @@ endif
 "augroup END
 
 " search for visually hightlighted text
-vnoremap <c-f> y<ESC>/<c-r>"<CR>   
+vnoremap <c-f> y<ESC>/<c-r>"<CR>
 
 set grepprg=grep\ -nH\ $*
 
+" Disable any mousing
+if has("mouse")
+	set mouse=
+endif
+
 " Don't wake up system with blinking cursor:
 " http://www.linuxpowertop.org/known.php
 let &guicursor = &guicursor . ",a:blinkon0"