fixed math error in docstring
sorted out normalization problem for the fft spectrum function
Merge branch 'master' of github.com:qutip/qutip