add yolo
Update sub repos
Merge branch 'master' of github.com:dinomite/homedir

Conflicts:
	.ssh