fixed typo bug in __init__.py
Merge branch 'master' of github.com:qutip/qutip
added optional number state offsets to oscillator mode operators
added optional number state offset to fock_distribution visualization function
optionally do not show the full unit range on y axis in fock distribution plots
added a notebook with tests and demonstrations of lower number state cut offs with harmonic operators
fix bug in mcsolve where output states where not stored properly as a result of the resent flattening of vectors
use inline math mode instead of equation environment
ADDED: Qobj view_methods

Cleaned up Qobj method doc strings so that the first line fits within
80 char.
UPDATED: liouvillian can be called without specifying c_ops

good for converting standard hamiltonian terms to Liouvillians
simplied code in preparation for adding offset argument
added offset options to some state functions
examples and test of using offset argument with states
ADDED: can specify own preconditioner in steadystate solvers

User can input their own preconditioner using the 'M' keyword arg.
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().
minor bug fix in sesolve that made expectation values get complex dtype even for hermitian operators
added method options to wigner_fock_distribution and support for the fft method
requirements.txt file for pip
bugfixes in benchmark scripts