scripts
Merge branch 'master' of github.com:scottdavis/dotfiles

* 'master' of github.com:scottdavis/dotfiles:
  Added ruby version output
Merge branch 'master' of github.com:scottdavis/dotfiles

* 'master' of github.com:scottdavis/dotfiles:
  Update aliases
  Update aliases
tmux
Merge branch 'master' of github.com:scottdavis/dotfiles

* 'master' of github.com:scottdavis/dotfiles:
  cha
  added proxy unset
  sha
  sha
  added xdebug
  sha