more config
Merge branch 'fish' of github.com:niedhui/dotfiles into fish

Conflicts:
	config/fish/config.fish
	tmux.conf