Define a comment character for the password file.
Document a typical way to structure your password file in the man page (and README).
Merge /tmp/mdp.old/mdp

Conflicts:
	tests/functional/run_tests.sh