Reduce diff to robbyrussell/master
Remove zlogin; copied from dotfiles upstream, not used