From cb1199c5b8bb47b8875bc137c6ad4ae983e532d4 Mon Sep 17 00:00:00 2001
From: Tom Manville <tdmanville@maginatics.com>
Date: Sat, 20 Dec 2014 10:07:12 -0800
Subject: [PATCH] Fixed dotfiles' names.

Also added setup vimdiff with git.
---
 gitconfig  | 4 ++++
 install.sh | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gitconfig b/gitconfig
index 22e15c0..120e2f7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,3 +5,7 @@
 	editor = vim
 [push]
 	default = simple
+[diff]
+	tool = vimdiff
+[difftool]
+	prompt = false
diff --git a/install.sh b/install.sh
index 8d9c23c..1d80880 100644
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ln -s ./dotfiles/.vimrc .
-ln -s ./dotfiles/.tmux.conf .
-ln -s ./dotfiles/.gitconfig .
-cat ./dotfiles/.bashrc >> .bashrc
+ln -s ./dotfiles/vimrc .vimrc  
+ln -s ./dotfiles/tmux.conf .tmux.conf 
+ln -s ./dotfiles/gitconfig .gitconfig 
+cat ./dotfiles/bashrc >> .bashrc
 git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
 vim +BundleInstall +qall
 sudo pip install git+git://github.com/Lokaltog/powerline