bash
ssh-beta
ChangeDir
positional
Merge branch 'master' into mac

Conflicts:
	.bashrc