made the testMain app a little more Haskell standard
merging master into snapSkeleton