Merge branch 'mplegendre-multi_pkgsrc_roots' into develop

- This moves var/spack/packages to var/spack/repos/builtin/packages.

- Packages that did not exist in the source branch, or were changed in
  develop, were moved into var/spack/repos/builtin/packages as part of
  the integration.

Conflicts:
	lib/spack/spack/test/unit_install.py
	var/spack/repos/builtin/packages/clang/package.py

var/spack/repos/builtin/packages/py-mock/package.py

@@ -0,0 +1,18 @@
+from spack import *
+
+class PyMock(Package):
+    """mock is a library for testing in Python. It allows you to replace parts
+    of your system under test with mock objects and make assertions about how
+    they have been used."""
+
+    homepage = "https://github.com/testing-cabal/mock"
+    url      = "https://pypi.python.org/packages/source/m/mock/mock-1.3.0.tar.gz"
+
+    version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb')
+
+    extends('python')
+    depends_on('py-pbr')
+    depends_on('py-setuptools@17.1:')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)