Merge New Template Haskell branch.
authorGeoffrey Mainland <mainland@apeiron.net>
Fri, 4 Oct 2013 21:54:32 +0000 (17:54 -0400)
committerGeoffrey Mainland <mainland@apeiron.net>
Fri, 4 Oct 2013 21:54:32 +0000 (17:54 -0400)

Trivial merge