Merge branch 'master' into master

Author: jaygambetta

qiskit/advanced/terra/7_different_qubit_technologies.ipynb

@@ -20,8 +20,8 @@
 """Helper for running the notebooks as unit tests.
 
 Convenience script for running the notebooks as individual `unittest` tests
-using the standard Python facilites. By default, only the notebooks under
-`reference/` are automatically discovered (can be modified via the
+using the standard Python facilites. By default, all notebooks under
+`qiskit/` are automatically discovered (can be modified via the
 `NOTEBOOK_PATH` variable).
 
 The test can be run by using the regular unittest facilities from the root