Tests for Mz and Mx faux measurement functions
Implementation of faux measurements in sympy
Simple test functions, modified to correctly spell "labeller"
Merge pull request #2325 from rpmuller/fixed_qcircuit_measurement

Merge of fixed_qcircuit_measurement branch to allow simple measurements.
Merge branch 'master' into single_code_base
Python 3.2 unicode fixes for circuitplot