misc dotfile changes (intelduo)
Merge branch 'master' into zfs-notes
Merge branch 'master' into zfs-notes
misc dotfile changes (intelduo)
Merge branch 'master' into zfs-notes
Merge branch 'zfs-notes'

Conflicts:
	home-machines/.functions.sh