no active border colors in servy tmux
Merge branch 'master' of ssh://github.com/FruitieX/dotfiles

Conflicts:
	.tmux.servy