Add a new option, -s, which will surround the password with symbol characters.  Fix a mistake in the testing target of the makefile.