add /sbin and /usr/sbin to path
Merge branch 'master' of https://github.com/timjb/dotfiles

Conflicts:
	.config/fish/config.fish