Update circuit drawing notebook for order changes again (#418)

At the last minute we decided to change the order back to what it was
before, and standardize on that for visualization. This commit adjusts
the visualizations in the notebook to that, by using
Qiskit/qiskit#1475 applied.

Author: mtreinish