new genpassword
Merge branch 'master' of https://github.com/varp/dotfiles

Conflicts:
	bin/genpasswd.sh