Fixing up some problems with the haddock doc generation
Looks like i put the HaskellMacros.cmake change in the wrong branch last night, just putting it into master
Merge branch 'master' into snapSkeleton