Changes to ghc haddock

Changes to ghc:

Changes to haddock:
commit 96838d249070e1ab55641b6816360a3e6bc909fa
Author: Austin Seipp <austin@well-typed.com>
Date:   Wed Jan 29 08:09:04 2014 -0600

    Update CPP check for __GLASGOW_HASKELL__

    Signed-off-by: Austin Seipp <austin@well-typed.com>