Added tmux conf :D
Merge branch 'master' of https://github.com/GriffinHeart/user-config

* 'master' of https://github.com/GriffinHeart/user-config:
  Removing oh-my-zsh this is handled by boxen
  fixing gaaah
  updated