Merge branch 'master' into dev

Elm.cabal

@@ -1,5 +1,5 @@
 Name:                Elm
-Version:             0.10.0.2
+Version:             0.10.1
 Synopsis:            The Elm language module.
 Description:         Elm aims to make client-side web-development more pleasant.
                      It is a statically/strongly typed, functional reactive

README.md

@@ -3,11 +3,15 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)
 
 ## Install
 
-**Note for OS X 10.9 Maverics:** you must follow
+**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
+jump to the [My First Project](#my-first-project) section.
+<br/>
+**OS X 10.9** &mdash; follow
 [these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
-before continuing!
+before continuing with the platform agnostic directions below.
 
-Download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/).
+**Platform Agnostic** &mdash;
+download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/).
 Once the Haskell Platform is installed:
 
     cabal update
@@ -19,11 +23,8 @@ Once the Haskell Platform is installed:
 To use `elm` and `elm-server` you may need to add a new directory to your PATH.
 
 Cabal should tell you where your executables are located upon
-successful installation.
-
-For me, the executables were placed in `/home/evan/.cabal/bin` which I
-appended to the end of my PATH variable in my .bashrc file.
-
+successful installation. It'll be something like `/home/evan/.cabal/bin`
+which you should append to your PATH variable.
 See this tutorial if you are new to changing your PATH in
 [Unix/Linux](http://www.cyberciti.biz/faq/unix-linux-adding-path/).
 
@@ -44,8 +45,15 @@ allowing you to navigate to `Main.elm` and see your first program in action.
 
 #### Final Notes
 
-The `elm` package provides support for compilation of Elm code directly in Haskell.
-Check it out [on Hackage](http://hackage.haskell.org/package/Elm) if you are interested.
+The `elm` package provides
+[some utility functions](http://hackage.haskell.org/package/Elm) for
+working with Elm in Haskell. This can be useful for creating tooling
+for Elm, and has been useful for projects like
+[the website](http://elm-lang.org/) and
+[`elm-get`](https://github.com/evancz/elm-get). Email the list if you
+want to rely on these functions!
 
-If you are stuck, email [the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)
-or ask a question in the [#Elm IRC channel](http://webchat.freenode.net/?channels=elm).
+If you are stuck, email
+[the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss)
+or ask a question in the
+[#Elm IRC channel](http://webchat.freenode.net/?channels=elm). 

libraries/elm_dependencies.json

@@ -1,9 +1,9 @@
-{ "version": "0.10.0.2"
+{ "version": "0.10.1"
 , "summary": "Elm's standard libraries"
-, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.11, you should be using version 0.11 of the standard libraries."
+, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.10.1, you should be using version 0.10.1 of the standard libraries."
 , "license": "BSD3"
 , "repository": "http://github.com/evancz/Elm.git"
-, "elm-version": "0.10.0.2"
+, "elm-version": "0.10.1"
 , "dependencies": {}
 , "exposed-modules":
     [ "Basics"
@@ -36,4 +36,4 @@
     , "WebSocket"
     , "Window"
     ]
-}
+}

server/Server.hs

@@ -12,7 +12,7 @@ import System.Exit
 import System.FilePath
 import System.Process
 import GHC.IO.Handle
-import qualified Language.Elm as Elm
+import qualified Elm.Internal.Paths as ElmPaths
 import Paths_elm_server
 
 runtime = "/elm-runtime.js"
@@ -74,7 +74,7 @@ parse ("--help":_) = putStrLn usage
 parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
 parse args =
   if null remainingArgs then
-      serve portNumber =<< elmRuntime
+      serve portNumber elmRuntime
   else
       putStrLn usageMini
 
@@ -86,9 +86,9 @@ parse args =
     argValue arg = tail $ dropWhile (/= '=') (head arg)
     portNumber = if null portArg then 8000 else read (argValue portArg) :: Int
     elmRuntime = if null runtimeArg then
-                     Elm.runtime
+                     ElmPaths.runtime
                  else
-                     return $ argValue runtimeArg
+                     argValue runtimeArg
 
 usageMini :: String
 usageMini =

server/elm-server.cabal

@@ -1,5 +1,5 @@
 Name:                elm-server
-Version:             0.10
+Version:             0.10.1
 Synopsis:            The Elm language server.
 Description:         This package provides a standalone, Happstack-based Elm server.
 
@@ -36,5 +36,5 @@ Executable elm-server
                        happstack-server,
                        deepseq,
                        filepath,
-                       Elm >= 0.10,
+                       Elm >= 0.10.1,
                        process