Fixed X and CZ gates
Really stupid wire labels added to quantum circuit plot
Merge branch 'master' of https://github.com/sympy/sympy
Fixed X and CZ gates
Have tried unsuccessfully to build a two-qubit box
Attempting to build a multiqubit box gate.
Modified gate to allow "simplify" flag to override control gate simplifications.
Fine tuning qwire labels
Adding a flag to override cgate simplification
Merge branch 'sympy_qcircuit' of https://github.com/rpmuller/sympy into sympy_qcircuit

Conflicts:
	sympy/physics/quantum/gate.py
Fixed a conflict and streamlined the cgate simplification

Fixed a conflict that should have been caught before.

Streamlined the cgate simplification process. Now, if you form a 2Q
gate by calling CGate(), it by default does not simplify the gate.
However, if you call CNOT or CPHASE, it does simplify the gate. I
believe this is the desired behavior.
Added an auto-labler function for quantum wires
Added CGateS to the __all__ list of gates
Formatting
Added circuitplot unittests
Don't use -qq with apt-get in .travis.yml

This should prevent timeouts from no output in 10 minutes.  Travis
automatically folds this output, so it's not a big deal.
Merge branch 'master' of https://github.com/sympy/sympy
Fixed X and CZ gates
Have tried unsuccessfully to build a two-qubit box
Attempting to build a multiqubit box gate.