Make test commands that contain quotes work
Merge branch 'master' of github.com:ContinuumIO/conda