Merge remote-tracking branch 'gitorious/master' into phoenix

.bash_profile

@@ -0,0 +1,7 @@
+# -*- eval: (git-auto-commit-mode 1) -*-
+export BROWSER=conkeror
+export EDITOR="emacsclient -c -a emacs"
+export INFOPATH="${HOME}/documents/info:${INFOPATH}"
+export PATH="${HOME}/bin:${PATH}:/usr/local/bin"
+
+alias cower="cower --color=always --target=$HOME/var/aur"

.conkerorrc/webjumps.js

@@ -24,3 +24,6 @@ define_webjump("ddg",
 define_webjump("metal-archives",
                "http://www.metal-archives.com/search?searchString=%s&type=band_name",
                $alternative="http://www.metal-arhives.com");
+define_webjump("djangodocs",
+               "https://docs.djangoproject.com/search/?q=%s&release=5",
+               $alternative="https://docs.djangoproject.com/");

.gitignore

@@ -104,7 +104,6 @@ xhtml-loader.rnc
 .emacs.d/
 .cuyo
 .lgames
-.bash*
 .beetsmusic.blb
 .beetsstate
 .msmtprc

.zshenv

@@ -10,7 +10,6 @@ export LESS_TERMCAP_ue=$'\e[0m'
 export LESS_TERMCAP_us=$'\e[0;36m'
 
 export PAGER=$LESSCMD
-export EDITOR="emacsclient -c"
 
 # Aliases
 alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc"""

.zshrc

@@ -1,11 +1,5 @@
 # -*- Mode: shell-script; eval: (git-auto-commit-mode 1) -*-
 # Setup variables
-PATH="${HOME}/bin:${PATH}:/usr/local/bin"
-INFOPATH="${HOME}/documents/info:${INFOPATH}"
-
-export INFOPATH
-export BROWSER=conkeror
-
 HISTFILE=~/.zsh/histfile
 HISTSIZE=1000
 SAVEHIST=1000