testing changes
Merge github.com:changhoonhahn/powerspec

Merged one of the plotting python programs.

Conflicts:
	bispectrum/plot_bispec_maneramock_south_qbar.py