Add quotes to preserve more sane quoting in what we pass through.
Merge pull request #957 from brendandburns/shell_sucks

Add quotes to preserve more sane quoting in what we pass through.