added osx from mathias bynen
Merge branch 'master' of github.com:jcordry/dotfiles
added tmux from skwp