Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase

Conflicts:
	lib/spack/spack/cmd/install.py
	lib/spack/spack/cmd/setup.py

1 files changed, 4 insertions, 10 deletions

diff --git a/README.md b/README.md
index ec2da3934e..853e071fc6 100644
--- a/README.md
+++ b/README.md
@@ -63,17 +63,11 @@ Contributing to Spack is relatively easy.  Just send us a
 When you send your request, make ``develop`` the destination branch on the
 [Spack repository](https://github.com/LLNL/spack).
 
-Before you send a PR, your code should pass the following checks:
-
-* Your contribution will need to pass the `spack test` command.
-  Run this before submitting your PR.
-
-* Also run the `share/spack/qa/run-flake8-tests` script to check for PEP8 compliance.
-  To encourage contributions and readability by a broad audience,
-  Spack uses the [PEP8](https://www.python.org/dev/peps/pep-0008/) coding
-  standard with [a few exceptions](https://github.com/LLNL/spack/blob/develop/.flake8).
-
+Your PR must pass Spack's unit tests and documentation tests, and must be
+[PEP 8](https://www.python.org/dev/peps/pep-0008/) compliant.
 We enforce these guidelines with [Travis CI](https://travis-ci.org/LLNL/spack).
+To run these tests locally, and for helpful tips on git, see our
+[Contribution Guide](http://spack.readthedocs.io/en/latest/contribution_guide.html).
 
 Spack uses a rough approximation of the [Git
 Flow](http://nvie.com/posts/a-successful-git-branching-model/)