Merge branch 'master' into mps-tutorial

Author: nonhermitian

.github/CODEOWNERS

@@ -1,15 +1,2 @@
 # Fallback codeowners for all files that do not have an explicit rule.
-* @jaygambetta @ajavadia
-
-# Codeowners for individual folders
-qiskit/* @jaygambetta @ajavadia
-
-qiskit/aqua/**/* @jaygambetta @pistoia
-qiskit/artificial_intelligence/**/* @jaygambetta @pistoia
-qiskit/chemistry/**/* @jaygambetta @pistoia
-qiskit/finance/**/* @jaygambetta @pistoia
-qiskit/optimization/**/* @jaygambetta @pistoia
-
-qiskit/aer/* @chriseclectic @jaygambetta @ajavadia
-qiskit/ignis/* @dcmckayibm @jaygambetta @ajavadia
-qiskit/terra/* @nonhermitian @jaygambetta @ajavadia
+* @jaygambetta @nonhermitian