Fixed type detection, added reattach pbcopy to tmux
Merge branch 'master' of github.com:Nthalk/dotfiles

Conflicts:
	fish/config.fish