I don't like relativenumber
Fix shell for fish
Set tmux shell to fish
Remove old tmux powerline stuff
Update gitconfig
Merge remote-tracking branch 'origin/master'

Conflicts:
	.tmux.conf
	.vimrc