Delete tmux.conf on macbook air
Merge branch 'master' of github.com:jtwp470/dotfiles

Conflicts:
	.tmux.conf