Merge branch 'master' into laptop

diff --combined shell/.bashrc
index 9914d82,f313733..4427af9
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -6,22 -6,23 +6,21 @@@ export HISTSIZE=NOTHIN
  shopt -s histappend
  export PROMPT_COMMAND='history -a'
  
 -. /usr/share/bash-completion/bash_completion
 -
  export TERMINAL=urxvtc
  export EDITOR=vim
  export TERM=screen
  export BROWSER=firefox
 -export PAGER=less
 +export PAGER=more
  
 -export SUDO_ASKPASS=/usr/bin/ssh-askpass
 -export NOTMUCH_CONFIG=/home/mart/.mutt/notmuch-config
 +export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 +export NOTMUCH_CONFIG=~/.mutt/notmuch-config
  
 -export CLEAN_HOME=~/projects/clean
 -export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:~/.local/bin
 +export CLEAN_HOME=/opt/clean
 +export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
  
  alias ls='ls --color=auto'
  alias grep='grep --color=auto'
  alias vi=vim
- alias autoclean='sudo pacman -R $(pacman -Qtdq)'
  
  set_prompt(){
        last_c=$?