update dotfiles

.functions

@@ -28,3 +28,13 @@ function update_zamboni() {
     pip install --no-deps --exists-action=w -r requirements/dev.txt
     schematic migrations
 }
+
+function merge_pull_request() {
+    echo $1
+    git remote add $1 git://github.com/$1/$2.git
+    git fetch $1
+    git checkout $3
+    git rebase master
+    git checkout master
+    git merge $3
+}

.gitconfig

@@ -7,3 +7,11 @@
 	user = ametaireau
 [core]
 	excludesfile = /home/alexis/.gitignore
+[giggle]
+	main-window-maximized = true
+	main-window-geometry = 700x550+49+24
+	history-view-vpane-position = 469
+	main-window-view = HistoryView
+	file-view-vpane-position = 356
+[alias]
+co = checkout

.vimrc

@@ -48,8 +48,8 @@ vnoremap <tab> %
 set wrap
 set textwidth=79
 set formatoptions=qrn1
-set list
-set listchars=tab:▸\
+"set list
+"set listchars=tab:▸/
 
 "set acd                         " auto change directory
 set laststatus=2                " Always set a status line

.zshrc

@@ -3,10 +3,11 @@ ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="kennethreitz"
 COMPLETION_WAITING_DOTS="true"
 
-plugins=(git python debian github pip)
+plugins=(python debian github pip)
 
 export EDITOR="vim"
 source $ZSH/oh-my-zsh.sh
 source /usr/local/bin/virtualenvwrapper.sh
 source $HOME/.functions
 source $HOME/.aliases
+export PIP_DOWNLOAD_CACHE="~/.pipcache"