make QDiagram back into a newtype (checkpoint)

Doesn't compile, a few more things need to be updated.
See the wiki page for justification: http://www.haskell.org/haskellwiki/Diagrams/Dev/Fixpoint#Diagrams.Core.Types