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

diff --cc shell/.bashrc
index 7db3f56,6e186aa..77c7afa
--- 1/shell/.bashrc
--- 2/shell/.bashrc
+++ b/shell/.bashrc
@@@ -30,9 -30,10 +30,11 @@@ export COLORFGBG="default;default
  alias ls='ls --color=auto'
  alias grep='grep --color=auto'
  alias vi=vim
 +export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
  alias tmux='tmux -f ~/.config/tmux/config'
  
+ . /etc/bash_completion
+ 
  set_prompt(){
        last_c=$?
        PS1='\u@\h'