Revise cpp and haskell quickrun-config
Merge branch 'master' into mac