added controlled RX, RY, RZ gates. Fixed bug in expansion of toffoli gate in terms of cnot and single qubit gates
Merge pull request #212 from jrjohansson/fix-toffoli-cnot-expansion

qip.circuit updates