Minor fix in coherence_function_g2().

Added 'options=options' to call to mesolve() when calculating photon
number in coherence_function_g2() in qutip/correlation.py.

	modified:   qutip/correlation.py
Merge pull request #47 from arnelg/master

Minor fix in coherence_function_g2().