Removed things breaking on Linux. Add color to active pane border.
Merge branch 'master' of github.com:diversario/tmux-config

Conflicts:
	.tmux.conf