Merge branch 'master' of https://github.com/dopefishh/dotfiles

diff --cc shell/.bashrc
index da1cc97,dfab714..014c4e1
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -16,10 -16,8 +16,10 @@@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-as
  export NOTMUCH_CONFIG=~/.config/notmuch/config
  
  export CLEAN_HOME=/opt/clean
 -export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
 +export PATH=~/.local/bin:$PATH
 +export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
- export PATH=$PATH:~/.local/texlive/2016/bin/x86_64-linux
 +export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin
+ export PATH=$PATH:/opt/texlive/2016/bin/x86_64-linux
  
  export GTK_IM_MODULE=xim
  export QT_IM_MODULE=xim