Merge pull request #160 from ariddell/master

Quote password variables (they may contain spaces)
Quote password substitution (may contain spaces)