diff --git a/Build.hs b/Build.hs
--- a/Build.hs
+++ b/Build.hs
@@ -10,7 +10,7 @@
 -- FIXME there's a bug when getFileStatus applies to a file
 -- temporary deleted (e.g., Vim saving a file)
 
-import           Control.Applicative ((<|>))
+import           Control.Applicative ((<|>), many)
 import           Control.Exception (SomeException, try)
 import           Control.Monad (when, filterM, forM, forM_)
 
@@ -120,7 +120,7 @@
 determineHamletDeps :: FilePath -> IO [FilePath]
 determineHamletDeps x = do
     y <- TIO.readFile x -- FIXME catch IO exceptions
-    let z = A.parse (A.many $ (parser <|> (A.anyChar >> return Nothing))) y
+    let z = A.parse (many $ (parser <|> (A.anyChar >> return Nothing))) y
     case z of
         A.Fail{} -> return []
         A.Done _ r -> mapM go r >>= filterM doesFileExist . concat
diff --git a/scaffold/config/mongoDB.yml.cg b/scaffold/config/mongoDB.yml.cg
--- a/scaffold/config/mongoDB.yml.cg
+++ b/scaffold/config/mongoDB.yml.cg
@@ -9,7 +9,7 @@
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test
   <<: *defaults
 
diff --git a/scaffold/config/postgresql.yml.cg b/scaffold/config/postgresql.yml.cg
--- a/scaffold/config/postgresql.yml.cg
+++ b/scaffold/config/postgresql.yml.cg
@@ -9,7 +9,7 @@
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test
   <<: *defaults
 
diff --git a/scaffold/config/settings.yml.cg b/scaffold/config/settings.yml.cg
--- a/scaffold/config/settings.yml.cg
+++ b/scaffold/config/settings.yml.cg
@@ -5,7 +5,7 @@
 Development:
   <<: *defaults
 
-Test:
+Testing:
   <<: *defaults
 
 Staging:
diff --git a/scaffold/config/sqlite.yml.cg b/scaffold/config/sqlite.yml.cg
--- a/scaffold/config/sqlite.yml.cg
+++ b/scaffold/config/sqlite.yml.cg
@@ -5,7 +5,7 @@
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test.sqlite3
   <<: *defaults
 
diff --git a/yesod.cabal b/yesod.cabal
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -1,14 +1,16 @@
 name:            yesod
-version:         0.9.3.2
+version:         0.9.3.3
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
 maintainer:      Michael Snoyman <michael@snoyman.com>
 synopsis:        Creation of type-safe, RESTful web applications.
 description:
-    Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
+    A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
     .
-    The Yesod documentation site <http://docs.yesodweb.com/> has much more information, tutorials and information on some of the supporting packages, like Hamlet and web-routes-quasi.
+    Yesod also focuses on developer productivity. Yesod integrates well with tools for all your basic web development (wai, persistent, and shakespeare/hamlet)
+    .
+    The Yesod documentation site <http://www.yesodweb.com/> has much more information, including on the supporting packages mentioned above.
 category:        Web, Yesod
 stability:       Stable
 cabal-version:   >= 1.6
@@ -104,7 +106,7 @@
                      , Cabal              >= 1.8          && < 1.13
                      , unix-compat        >= 0.2          && < 0.4
                      , containers         >= 0.2          && < 0.5
-                     , attoparsec-text    >= 0.8.5        && < 0.8.5.2
+                     , attoparsec         >= 0.10
                      , http-types         >= 0.6.1        && < 0.7
                      , blaze-builder      >= 0.2.1.4      && < 0.4
                      , filepath           >= 1.1          && < 1.3