Include CPP defines from cabal and in a limited form from the command line.
Merge pull request #6 from fryguybob/master

Include defines for preprocessing.