sync up with v0.2.1 release

as available on Hackage
http://hackage.haskell.org/packages/archive/cabal-ghci/0.2.1/cabal-ghci-0.2.1.tar.gz

(alas http://code.atnnn.com/darcs/cabal-ghci/ is down currently)
Tweak cabal-ghci to include cabal_macros.h CPP header file

and also filter out CLI options ignored by GHCi