Update that allows for spaces in arguments

Ran into an issue with data-dir being defined with a space in the path.
Also escaping extra spaces.
Merge pull request #1 from kalley/master

Fix for spaces in argument values.