Added OperatorFunction class to operator.py
added support for OperatorFunctions in normal_ordered_form
resolved merge conflict in normal_ordered_form
added new module expectation.py in sympy.physics.quantum with classes Expectation and Covariance for quantum operators
fixed bug with innerproduct of BosonVacuumBra
added support for normal ordering of expectation expressions