Merge branch 'merge-pyconfigure'

Conflicts:
	docs/source/siteadmin/deploying.rst

diff --cc docs/source/siteadmin/deploying.rst
index 2f68912de647f4d6a7e147adbc7ff0f088a3e874,05cf172d58bc15c54df2a554864cbf24d1ae56b7..6123dc9e9165f3af150e004df332e09dbf10e18a
--- 1/docs/source/siteadmin/deploying.rst
--- 2/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@@ -203,9 -163,9 +203,9 @@@ Clone the MediaGoblin repository and se
      cd mediagoblin
      git submodule init && git submodule update
  
- Set up the in-package virtualenv::
 -Set up the in-package virtualenv via make:
++Set up the in-package virtualenv via make::
  
-     (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop
+     ./bootstrap.sh && ./configure && make
  
  .. note::