Updates
Incl tmux conf
Merge branch 'master' of github.com:carlosmarin/dotfiles-osx

* 'master' of github.com:carlosmarin/dotfiles-osx:
  Update OSX-customize.sh
  Update OSX-customize.sh
  Create .tmux.conf
  Update .gitconfig

Conflicts:
	.gitconfig
	.tmux.conf