Merge pull request #2 from trommler/cpp_settings

Cpp settings typo fix
Merge pull request #3 from trommler/cpp_settings

fix check if gcc is actually clang for cpp settings patch
Merge branch 'cpp_settings' of https://github.com/cartazio/ghc into cpp_settings