diff --git a/.install.conf.yaml b/.install.conf.yaml
index 08bda0f..7c632c4 100644
--- a/.install.conf.yaml
+++ b/.install.conf.yaml
@@ -8,7 +8,6 @@
 - 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/.config.swp b/git/.config.swp
new file mode 100644
index 0000000..b139cda
Binary files /dev/null and b/git/.config.swp differ
diff --git a/git/attributes b/git/attributes
deleted file mode 100644
index 3a225fe..0000000
--- a/git/attributes
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 5e772ac..5a3c9e2 100644
--- a/git/config
+++ b/git/config
@@ -8,7 +8,6 @@
 	default = matching
 [core]
 	excludesfile = ~/.config/git/ignore
-	attributesfile = ~/.config/git/attributes
 [color]
 	ui = auto
 [color "status"]
@@ -21,7 +20,7 @@
 [diff]
 	mnemonicPrefix = true
 	tool = vimdiff
-[diff "pandoc"]
+[diff "rst"]
 	textconv = pandoc --to=rst
 [diff "pdf"]
 	textconv = pdf2txt
diff --git a/vim/vimrc b/vim/vimrc
index 48dddb7..fd5864e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,7 +31,6 @@ if has("patch-7.4.710")
 else
 	set listchars=tab:→\ ,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
 endif
-set showbreak=\\
 
 "Folding
 "augroup vimrc
@@ -40,15 +39,10 @@ set showbreak=\\
 "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"