Merge branch 'master' into stable

Conflicts:
	libraries/elm_dependencies.json

.gitignore

@@ -1,5 +1,7 @@
 dist
 cabal-dev
+.cabal-sandbox/
+cabal.sandbox.config
 *.o
 *.hi
 *.chi

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "IO"]
 	path = IO
 	url = https://github.com/maxsnew/IO.git
-[submodule "automaton"]
-	path = automaton
-	url = https://github.com/evancz/automaton.git
 [submodule "Elm-Test"]
 	path = Elm-Test
 	url = https://github.com/deadfoxygrandpa/Elm-Test.git

CONTRIBUTING.md

@@ -1,36 +1,43 @@
 # Contributing to Elm
 
-Thanks helping with the development of Elm! This document
-describes the basic standards for opening pull requests:
+Thanks helping with the development of Elm! This document describes the basic
+standards for opening pull requests and making the review process as smooth as
+possible.
+
+## Licensing
+
+You need to sign the [contributor agreement](ContributorAgreement.pdf)
+and send it to <[email protected]> before opening your pull request.
+
+## Style Guide
+
+  * Haskell &mdash; conform to [these guidelines][haskell]
+  * JavaScript &mdash; use [Google's JS style guide][js]
+
+[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
+[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
 
 ## Branches
 
-  * [The master branch](https://github.com/elm-lang/Elm/tree/master) is the
-    home of the next release of the compiler so new features and improvements
-    get merged there. Most pull requests should target this branch!
+  * [The master branch][master] is the home of the next release of the compiler
+    so new features and improvements get merged there. Most pull requests
+    should target this branch!
 
-  * [The stable branch](https://github.com/elm-lang/Elm/tree/stable) is for
-    tagging previous releases and critical bug fixes. This branch is handy for
-    folks who want to build the most recent public release from source.
+  * [The stable branch][stable] is for tagging releases and critical bug fixes.
+    This branch is handy for folks who want to build the most recent public
+    release from source.
+
+[master]: http://github.com/elm-lang/elm/tree/master
+[stable]: http://github.com/elm-lang/elm/tree/stable
 
 If you are working on a fairly large feature, we will probably want to merge it
 in as its own branch and do some testing before bringing it into the master
 branch. This way we can keep releases of the master branch independent of new
 features.
 
-## Opening a pull request
-
-**Please open PRs against the [master branch of
-Elm](http://github.com/elm-lang/elm/tree/master) whenever possible.**
+Note that the master branch of the compiler should always be in sync with the
+master branch of the [website][], and the stable branch of the compiler should
+always be in sync with the stable branch of the [website][]. Make sure that
+your changes maintain this compatibility.
 
-Note that changes in the master branch of [Elm](https://github.com/elm-lang/Elm/)
-are able to be compiled against the master branch of the [elm-lang.org
-repo](https://github.com/elm-lang/elm-lang.org), and the stable branch of
-[Elm](https://github.com/elm-lang/Elm/) is able to be built with the stable
-branch of the [elm-lang.org repo](https://github.com/elm-lang/elm-lang.org).
-Please make sure that your changes maintain this compatibility.
-
-## Licensing
-
-You need to sign the [contributor agreement](ContributorAgreement.pdf)
-and send it to <[email protected]> before opening your pull request.
+[website]: https://github.com/elm-lang/elm-lang.org