Merge branch 'master' into dev

Elm.cabal

@@ -44,6 +44,7 @@ Library
                        SourceSyntax.Type,
                        Generate.JavaScript,
                        Generate.Noscript,
+                       Generate.Markdown,
                        Generate.Html,
                        Generate.Cases,
                        Transform.Canonicalize,
@@ -100,7 +101,6 @@ Library
 
 Executable elm
   Main-is:             Compiler.hs
-  ghc-options:         -threaded -O2
   Hs-Source-Dirs:      compiler
   other-modules:       SourceSyntax.Declaration,
                        SourceSyntax.Expression,
@@ -114,6 +114,7 @@ Executable elm
                        SourceSyntax.Type,
                        Generate.JavaScript,
                        Generate.Noscript,
+                       Generate.Markdown,
                        Generate.Html,
                        Generate.Cases,
                        Transform.Canonicalize,

compiler/Docs.hs

@@ -5,6 +5,7 @@ import System.Console.CmdArgs
 import System.Directory
 import System.FilePath
 import System.Exit
+import System.IO
 
 import Control.Applicative ((<$>), (<*>))
 import Data.Aeson
@@ -52,7 +53,7 @@ parseFile path = do
       createDirectoryIfMissing True (dropFileName docPath)
       BS.writeFile docPath (encodePretty' config json)
     Left err -> do
-      putStrLn $ "Parse error in " ++ path ++ " at " ++ show err
+      hPutStrLn stderr $ "Parse error in " ++ path ++ " at " ++ show err
       exitFailure
 
 docs :: IParser Value